Re: [PATCH] SUNRPC: Fix oops in the rpc_xdr_buf event class

[Bruce Fields <bfields@fieldses.org>]

On Thu, Nov 12, 2020 at 03:39:07PM -0500, Chuck Lever wrote:
> 
> 
> > 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 ?

Yep, thanks, I'll send another pull request in a few days.

--b.