This is a note to let you know that I've just added the patch titled
SUNRPC: Fix rpcgss_context trace event acceptor field
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a4833e3abae132d613ce7da0e0c9a9465d1681fa Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Google)" <rostedt@xxxxxxxxxxx>
Date: Wed, 10 Apr 2024 12:38:13 -0400
Subject: SUNRPC: Fix rpcgss_context trace event acceptor field
From: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
commit a4833e3abae132d613ce7da0e0c9a9465d1681fa upstream.
The rpcgss_context trace event acceptor field is a dynamically sized
string that records the "data" parameter. But this parameter is also
dependent on the "len" field to determine the size of the data.
It needs to use __string_len() helper macro where the length can be passed
in. It also incorrectly uses strncpy() to save it instead of
__assign_str(). As these macros can change, it is not wise to open code
them in trace events.
As of commit c759e609030c ("tracing: Remove __assign_str_len()"),
__assign_str() can be used for both __string() and __string_len() fields.
Before that commit, __assign_str_len() is required to be used. This needs
to be noted for backporting. (In actuality, commit c1fa617caeb0 ("tracing:
Rework __assign_str() and __string() to not duplicate getting the string")
is the commit that makes __string_str_len() obsolete).
Cc: stable@xxxxxxxxxxxxxxx
Fixes: 0c77668ddb4e ("SUNRPC: Introduce trace points in rpc_auth_gss.ko")
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/trace/events/rpcgss.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/include/trace/events/rpcgss.h
+++ b/include/trace/events/rpcgss.h
@@ -300,7 +300,7 @@ TRACE_EVENT(rpcgss_context,
__field(unsigned long, now)
__field(unsigned int, timeout)
__field(int, len)
- __string(acceptor, data)
+ __string_len(acceptor, data, len)
),
TP_fast_assign(
@@ -308,7 +308,7 @@ TRACE_EVENT(rpcgss_context,
__entry->now = now;
__entry->timeout = timeout;
__entry->len = len;
- strncpy(__get_str(acceptor), data, len);
+ __assign_str(acceptor, data);
),
TP_printk("gc_expiry=%lu now=%lu timeout=%u acceptor=%.*s",
Patches currently in stable-queue which might be from rostedt@xxxxxxxxxxx are
queue-5.4/selftests-ftrace-limit-length-in-subsystem-enable-tests.patch
queue-5.4/ring-buffer-only-update-pages_touched-when-a-new-pag.patch
queue-5.4/sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch
