Skip to contentSkip to conversation

tracing: Update print fmt check to handle new __get_sockaddr() macro

PATCH New Steven Rostedt 1 participant 1 message Jan 25, 2022 Tracing

lore
Share & tools
lore

Steven Rostedt

author maintainer
#0 lore raw

PATCH 1/1 tracing: Update print fmt check to handle new __get_sockaddr() macro

From: "Steven Rostedt (Google)" <[email protected]>

A helper macro was added to make reading socket addresses easier in trace events. It pairs %pISpc with __get_sockaddr() that reads the socket address from the ring buffer into a human readable format.

The boot up check that makes sure that trace events do not reference pointers to memory that can later be freed when the trace event is read, incorrectly flagged this as a delayed reference. Update the check to handle "__get_sockaddr" and not report an error on it.

Fixes 9580b78ebd878 ("tracing: Introduce helpers to safely handle dynamic-sized sockaddrs")
---
 kernel/trace/trace_events.c | 6 ++++++
 1 file changed, 6 insertions(+)
kernel/trace/trace_events.c +6 -0
index 3147614c1812..f527ae807e77 100644
@@ -384,6 +384,12 @@ static void test_event_printk(struct trace_event_call *call)
 			if (!(dereference_flags & (1ULL << arg)))
 				goto next_arg;
 
+			/* Check for __get_sockaddr */;
+			if (str_has_prefix(fmt + i, "__get_sockaddr(")) {
+				dereference_flags &= ~(1ULL << arg);
+				goto next_arg;
+			}
+
 			/* Find the REC-> in the argument */
 			c = strchr(fmt + i, ',');
 			r = strstr(fmt + i, "REC->");
Signature · 1 line
2.33.0