Skip to content

Commit d321ff5

Browse files
chuckleverJ. Bruce Fields
authored andcommitted
SUNRPC: Fix general protection fault in trace_rpc_xdr_overflow()
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: 5582863 ("SUNRPC: Add XDR overflow trace event") Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
1 parent 1905cac commit d321ff5

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

include/trace/events/sunrpc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -655,10 +655,10 @@ TRACE_EVENT(rpc_xdr_overflow,
655655
__field(size_t, tail_len)
656656
__field(unsigned int, page_len)
657657
__field(unsigned int, len)
658-
__string(progname,
659-
xdr->rqst->rq_task->tk_client->cl_program->name)
660-
__string(procedure,
661-
xdr->rqst->rq_task->tk_msg.rpc_proc->p_name)
658+
__string(progname, xdr->rqst ?
659+
xdr->rqst->rq_task->tk_client->cl_program->name : "unknown")
660+
__string(procedure, xdr->rqst ?
661+
xdr->rqst->rq_task->tk_msg.rpc_proc->p_name : "unknown")
662662
),
663663

664664
TP_fast_assign(

0 commit comments

Comments
 (0)