linux-kernel - Re: [PATCH] s390/dasd: replace PTR_RET with PTR_ERR_OR

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Thu, 19 Jul 2018 16:40:59 +0200
From:   Martin Schwidefsky <schwidefsky@...ibm.com>
To:     "Gustavo A. R. Silva" <gustavo@...eddedor.com>
Cc:     Stefan Haberland <sth@...ux.ibm.com>,
        Jan Hoeppner <hoeppner@...ux.ibm.com>,
        Heiko Carstens <heiko.carstens@...ibm.com>,
        linux-s390@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] s390/dasd: replace PTR_RET with PTR_ERR_OR_ZERO

On Wed, 18 Jul 2018 23:50:50 -0500
"Gustavo A. R. Silva" <gustavo@...eddedor.com> wrote:

> PTR_RET is deprecated, use PTR_ERR_OR_ZERO instead.
> 
> Signed-off-by: Gustavo A. R. Silva <gustavo@...eddedor.com>
> ---
>  drivers/s390/block/dasd_eckd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
> index bbf95b7..c5a5551 100644
> --- a/drivers/s390/block/dasd_eckd.c
> +++ b/drivers/s390/block/dasd_eckd.c
> @@ -3535,7 +3535,7 @@ static int prepare_itcw(struct itcw *itcw,
> 
>  	dcw = itcw_add_dcw(itcw, pfx_cmd, 0,
>  		     &pfxdata, sizeof(pfxdata), total_data_size);
> -	return PTR_RET(dcw);
> +	return PTR_ERR_OR_ZERO(dcw);
>  }
> 
>  static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(

Applied to the s390/linux tree for the next merge window. Thanks.

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.