Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Content-Type: text/plain;
        charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\))
Subject: Re: [PATCH] SUNRPC: Fix oops in the rpc_xdr_buf event class
From:   Chuck Lever <chuck.lever@oracle.com>
In-Reply-To: <20201112201732.1689680-1-smayhew@redhat.com>
Date:   Thu, 12 Nov 2020 15:39:07 -0500
Cc:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        Scott Mayhew <smayhew@redhat.com>
Content-Transfer-Encoding: 7bit
Message-Id: <7F720342-6027-44B3-BAF2-F1F43721C407@oracle.com>
References: <20201112201732.1689680-1-smayhew@redhat.com>
To:     Bruce Fields <bfields@fieldses.org>
Precedence: bulk


> On Nov 12, 2020, at 3:17 PM, Scott Mayhew <smayhew@redhat.com> wrote:
> 
> Backchannel rpc tasks don't have task->tk_client set, so it's necessary
> to check it for NULL before dereferencing.
> 
> Fixes: c509f15a5801 ("SUNRPC: Split the xdr_buf event class")
> 
> Signed-off-by: Scott Mayhew <smayhew@redhat.com>
> ---
> include/trace/events/sunrpc.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
> index 2477014e3fa6..2a03263b5f9d 100644
> --- a/include/trace/events/sunrpc.h
> +++ b/include/trace/events/sunrpc.h
> @@ -68,7 +68,8 @@ DECLARE_EVENT_CLASS(rpc_xdr_buf_class,
> 
> 	TP_fast_assign(
> 		__entry->task_id = task->tk_pid;
> -		__entry->client_id = task->tk_client->cl_clid;
> +		__entry->client_id = task->tk_client ?
> +				     task->tk_client->cl_clid : -1;
> 		__entry->head_base = xdr->head[0].iov_base;
> 		__entry->head_len = xdr->head[0].iov_len;
> 		__entry->tail_base = xdr->tail[0].iov_base;
> -- 
> 2.25.4
> 

Bruce, can you take this one for v5.10-rc ?


--
Chuck Lever