summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2019-10-03 17:44:44 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-07 18:57:22 +0200
commit76b552775d601d8ec13d78b2e2df07aec34b0264 (patch)
tree2ba4851a1a7a5aa7bb86c33798954d891f521c74
parent7047aae6545698cd0615ae7844fabaf1aa402ad1 (diff)
downloadlinux-stable-76b552775d601d8ec13d78b2e2df07aec34b0264.tar.gz
linux-stable-76b552775d601d8ec13d78b2e2df07aec34b0264.tar.bz2
linux-stable-76b552775d601d8ec13d78b2e2df07aec34b0264.zip
rxrpc: Fix rxrpc_recvmsg tracepoint
[ Upstream commit db9b2e0af605e7c994784527abfd9276cabd718a ] Fix the rxrpc_recvmsg tracepoint to handle being called with a NULL call parameter. Fixes: a25e21f0bcd2 ("rxrpc, afs: Use debug_ids rather than pointers in traces") Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/trace/events/rxrpc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index 815dcfa64743..0fe169c6afd8 100644
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -1073,7 +1073,7 @@ TRACE_EVENT(rxrpc_recvmsg,
),
TP_fast_assign(
- __entry->call = call->debug_id;
+ __entry->call = call ? call->debug_id : 0;
__entry->why = why;
__entry->seq = seq;
__entry->offset = offset;