* [PATCH] SUNRPC: Fix general protection fault in trace_rpc_xdr_overflow()
@ 2020-10-23 14:41 Chuck Lever
2020-11-06 22:28 ` J. Bruce Fields
0 siblings, 1 reply; 2+ messages in thread
From: Chuck Lever @ 2020-10-23 14:41 UTC (permalink / raw)
To: bfields; +Cc: linux-nfs
The TP_fast_assign() section is careful enough not to dereference
xdr->rqst if it's NULL. The TP_STRUCT__entry section is not.
Fixes: 5582863f450c ("SUNRPC: Add XDR overflow trace event")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
include/trace/events/sunrpc.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index f45b3c01370c..2477014e3fa6 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -655,10 +655,10 @@ TRACE_EVENT(rpc_xdr_overflow,
__field(size_t, tail_len)
__field(unsigned int, page_len)
__field(unsigned int, len)
- __string(progname,
- xdr->rqst->rq_task->tk_client->cl_program->name)
- __string(procedure,
- xdr->rqst->rq_task->tk_msg.rpc_proc->p_name)
+ __string(progname, xdr->rqst ?
+ xdr->rqst->rq_task->tk_client->cl_program->name : "unknown")
+ __string(procedure, xdr->rqst ?
+ xdr->rqst->rq_task->tk_msg.rpc_proc->p_name : "unknown")
),
TP_fast_assign(
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] SUNRPC: Fix general protection fault in trace_rpc_xdr_overflow()
2020-10-23 14:41 [PATCH] SUNRPC: Fix general protection fault in trace_rpc_xdr_overflow() Chuck Lever
@ 2020-11-06 22:28 ` J. Bruce Fields
0 siblings, 0 replies; 2+ messages in thread
From: J. Bruce Fields @ 2020-11-06 22:28 UTC (permalink / raw)
To: Chuck Lever; +Cc: linux-nfs
Also applied.--b.
On Fri, Oct 23, 2020 at 10:41:07AM -0400, Chuck Lever wrote:
> The TP_fast_assign() section is careful enough not to dereference
> xdr->rqst if it's NULL. The TP_STRUCT__entry section is not.
>
> Fixes: 5582863f450c ("SUNRPC: Add XDR overflow trace event")
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
> include/trace/events/sunrpc.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
> index f45b3c01370c..2477014e3fa6 100644
> --- a/include/trace/events/sunrpc.h
> +++ b/include/trace/events/sunrpc.h
> @@ -655,10 +655,10 @@ TRACE_EVENT(rpc_xdr_overflow,
> __field(size_t, tail_len)
> __field(unsigned int, page_len)
> __field(unsigned int, len)
> - __string(progname,
> - xdr->rqst->rq_task->tk_client->cl_program->name)
> - __string(procedure,
> - xdr->rqst->rq_task->tk_msg.rpc_proc->p_name)
> + __string(progname, xdr->rqst ?
> + xdr->rqst->rq_task->tk_client->cl_program->name : "unknown")
> + __string(procedure, xdr->rqst ?
> + xdr->rqst->rq_task->tk_msg.rpc_proc->p_name : "unknown")
> ),
>
> TP_fast_assign(
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-06 22:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-23 14:41 [PATCH] SUNRPC: Fix general protection fault in trace_rpc_xdr_overflow() Chuck Lever
2020-11-06 22:28 ` J. Bruce Fields
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox