sunrpc: removed redundant procp check

[PATCH] sunrpc: removed redundant procp check

Posted by Aleksandr Aprelkov 1 year, 10 months ago

since vs_proc pointer is dereferenced before getting it's address there's
no need to check for NULL.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 8e5b67731d08 ("SUNRPC: Add a callback to initialise server requests")
Signed-off-by: Aleksandr Aprelkov <aaprelkov@usergate.com>
---
 net/sunrpc/svc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index b33e429336fb..2b4b1276d4e8 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1265,8 +1265,6 @@ svc_generic_init_request(struct svc_rqst *rqstp,
 	if (rqstp->rq_proc >= versp->vs_nproc)
 		goto err_bad_proc;
 	rqstp->rq_procinfo = procp = &versp->vs_proc[rqstp->rq_proc];
-	if (!procp)
-		goto err_bad_proc;
 
 	/* Initialize storage for argp and resp */
 	memset(rqstp->rq_argp, 0, procp->pc_argzero);
-- 
2.34.1

Re: [PATCH] sunrpc: removed redundant procp check

Posted by Chuck Lever 1 year, 10 months ago

On Wed, Mar 27, 2024 at 02:10:44PM +0700, Aleksandr Aprelkov wrote:
> since vs_proc pointer is dereferenced before getting it's address there's
> no need to check for NULL.
> 
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> 
> Fixes: 8e5b67731d08 ("SUNRPC: Add a callback to initialise server requests")
> Signed-off-by: Aleksandr Aprelkov <aaprelkov@usergate.com>

Applied to nfsd-next. Thanks!


> ---
>  net/sunrpc/svc.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
> index b33e429336fb..2b4b1276d4e8 100644
> --- a/net/sunrpc/svc.c
> +++ b/net/sunrpc/svc.c
> @@ -1265,8 +1265,6 @@ svc_generic_init_request(struct svc_rqst *rqstp,
>  	if (rqstp->rq_proc >= versp->vs_nproc)
>  		goto err_bad_proc;
>  	rqstp->rq_procinfo = procp = &versp->vs_proc[rqstp->rq_proc];
> -	if (!procp)
> -		goto err_bad_proc;
>  
>  	/* Initialize storage for argp and resp */
>  	memset(rqstp->rq_argp, 0, procp->pc_argzero);
> -- 
> 2.34.1
> 

-- 
Chuck Lever

Re: [PATCH] sunrpc: removed redundant procp check

Posted by Jeff Layton 1 year, 10 months ago

On Wed, 2024-03-27 at 14:10 +0700, Aleksandr Aprelkov wrote:
> since vs_proc pointer is dereferenced before getting it's address there's
> no need to check for NULL.
> 
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> 
> Fixes: 8e5b67731d08 ("SUNRPC: Add a callback to initialise server requests")
> Signed-off-by: Aleksandr Aprelkov <aaprelkov@usergate.com>
> ---
>  net/sunrpc/svc.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
> index b33e429336fb..2b4b1276d4e8 100644
> --- a/net/sunrpc/svc.c
> +++ b/net/sunrpc/svc.c
> @@ -1265,8 +1265,6 @@ svc_generic_init_request(struct svc_rqst *rqstp,
>  	if (rqstp->rq_proc >= versp->vs_nproc)
>  		goto err_bad_proc;
>  	rqstp->rq_procinfo = procp = &versp->vs_proc[rqstp->rq_proc];
> -	if (!procp)
> -		goto err_bad_proc;
>  
>  	/* Initialize storage for argp and resp */
>  	memset(rqstp->rq_argp, 0, procp->pc_argzero);

This should probably go in via Chuck's tree.

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