Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <5fb73a5a-3840-3bd4-6b9b-ef6c9203f383@redhat.com>
Date:   Fri, 28 Oct 2022 14:20:15 -0400
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.0
Subject: Re: [PATCH V2] [nfs/nfs-utils/libtirpc] clnt_raw.c: fix a possible
 null pointer dereference
Content-Language: en-US
To:     Zhi Li <yieli@redhat.com>, linux-nfs@vger.kernel.org
References: <20221028091033.278199-1-yieli@redhat.com>
From:   Steve Dickson <steved@redhat.com>
In-Reply-To: <20221028091033.278199-1-yieli@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 10/28/22 5:10 AM, Zhi Li wrote:
> Since clntraw_private could be dereferenced before
> allocated, protect it by checking its value in advance.
> 
> Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2138317
> Signed-off-by: Zhi Li <yieli@redhat.com>
Committed...

steved.
> ---
>   src/clnt_raw.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/clnt_raw.c b/src/clnt_raw.c
> index 31f9d0c..03f839d 100644
> --- a/src/clnt_raw.c
> +++ b/src/clnt_raw.c
> @@ -142,7 +142,7 @@ clnt_raw_call(h, proc, xargs, argsp, xresults, resultsp, timeout)
>   	struct timeval timeout;
>   {
>   	struct clntraw_private *clp = clntraw_private;
> -	XDR *xdrs = &clp->xdr_stream;
> +	XDR *xdrs;
>   	struct rpc_msg msg;
>   	enum clnt_stat status;
>   	struct rpc_err error;
> @@ -154,6 +154,7 @@ clnt_raw_call(h, proc, xargs, argsp, xresults, resultsp, timeout)
>   		mutex_unlock(&clntraw_lock);
>   		return (RPC_FAILED);
>   	}
> +	xdrs = &clp->xdr_stream;
>   	mutex_unlock(&clntraw_lock);
>   
>   call_again:
> @@ -245,7 +246,7 @@ clnt_raw_freeres(cl, xdr_res, res_ptr)
>   	void *res_ptr;
>   {
>   	struct clntraw_private *clp = clntraw_private;
> -	XDR *xdrs = &clp->xdr_stream;
> +	XDR *xdrs;
>   	bool_t rval;
>   
>   	mutex_lock(&clntraw_lock);
> @@ -254,6 +255,7 @@ clnt_raw_freeres(cl, xdr_res, res_ptr)
>   		mutex_unlock(&clntraw_lock);
>   		return (rval);
>   	}
> +	xdrs = &clp->xdr_stream;
>   	mutex_unlock(&clntraw_lock);
>   	xdrs->x_op = XDR_FREE;
>   	return ((*xdr_res)(xdrs, res_ptr));