linux-kernel - Re: [PATCH v2 2/3] nfsd: Avoid some useless tests

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <e9fef086c63de6388d038918ff5a71099c654fc1.camel@kernel.org>
Date:   Thu, 01 Sep 2022 07:22:20 -0400
From:   Jeff Layton <jlayton@...nel.org>
To:     Christophe JAILLET <christophe.jaillet@...adoo.fr>,
        Chuck Lever <chuck.lever@...cle.com>
Cc:     linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org,
        Dan Carpenter <dan.carpenter@...cle.com>,
        linux-nfs@...r.kernel.org
Subject: Re: [PATCH v2 2/3] nfsd: Avoid some useless tests

On Thu, 2022-09-01 at 07:27 +0200, Christophe JAILLET wrote:
> memdup_user() can't return NULL, so there is no point for checking for it.
> 
> Simplify some tests accordingly.
> 
> Suggested-by: Dan Carpenter <dan.carpenter@...cle.com>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
> ---
>  fs/nfsd/nfs4recover.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
> index 248ff9f4141c..2968cf604e3b 100644
> --- a/fs/nfsd/nfs4recover.c
> +++ b/fs/nfsd/nfs4recover.c
> @@ -807,7 +807,7 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,
>  			if (get_user(namelen, &ci->cc_name.cn_len))
>  				return -EFAULT;
>  			name.data = memdup_user(&ci->cc_name.cn_id, namelen);
> -			if (IS_ERR_OR_NULL(name.data))
> +			if (IS_ERR(name.data))
>  				return -EFAULT;
>  			name.len = namelen;
>  			get_user(princhashlen, &ci->cc_princhash.cp_len);
> @@ -815,7 +815,7 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,
>  				princhash.data = memdup_user(
>  						&ci->cc_princhash.cp_data,
>  						princhashlen);
> -				if (IS_ERR_OR_NULL(princhash.data)) {
> +				if (IS_ERR(princhash.data)) {
>  					kfree(name.data);
>  					return -EFAULT;
>  				}
> @@ -829,7 +829,7 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,
>  			if (get_user(namelen, &cnm->cn_len))
>  				return -EFAULT;
>  			name.data = memdup_user(&cnm->cn_id, namelen);
> -			if (IS_ERR_OR_NULL(name.data))
> +			if (IS_ERR(name.data))
>  				return -EFAULT;
>  			name.len = namelen;
>  		}

Reviewed-by: Jeff Layton <jlayton@...nel.org>