Skip to contentSkip to conversation

tracing: Fix a UAF and regex bug on trace-event

PATCH New Masami Hiramatsu (Google) 1 participant 3 messages Jul 29 Tracing

lore
Share & tools
lore

Masami Hiramatsu (Google)

author maintainer
#0 lore raw

cover tracing: Fix a UAF and regex bug on trace-event

Hi,

Here are a couple of patches to fix a use-after-free bug in a error case on registering events in a module, and regex match problem.

Thanks,
---

Masami Hiramatsu (Google) (2):
tracing: Check return value of __register_event() in trace_module_add_events() tracing/filters: Fix false positive match in regex_match_full()

 kernel/trace/trace_events.c        |    4 ++--
 kernel/trace/trace_events_filter.c |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

--
Masami Hiramatsu (Google) <[email protected]>

author maintainer
#1 lore raw

PATCH 1/2 tracing: Check return value of __register_event() in trace_module_add_events()

From: Masami Hiramatsu (Google) <[email protected]>

trace_module_add_events() ignores the return value of __register_event() and unconditionally calls __add_event_to_tracers() for each event.

If __register_event() fails (for example, if event_init() fails), the trace_event_call is not added to ftrace_events list, but __add_event_to_tracers() still creates a trace_event_file pointing to it. If module loading subsequently fails and module memory is freed, tracing state retains a stale trace_event_call pointer in trace_event_file, leading to a use-after-free when tracefs or tracing subsystem operations are later executed.

Fix this by checking the return value of __register_event() and only calling __add_event_to_tracers() if event registration succeeded.

Fixes ae63b31e4d0e ("tracing: Separate out trace events from global variables")
Assisted-by Antigravity:gemini-3.5-flash
---
 kernel/trace/trace_events.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace_events.c +2 -2
index 956692856fa8..c01b10b99f67 100644
@@ -3933,8 +3933,8 @@ static void trace_module_add_events(struct module *mod)
 	end = mod->trace_events + mod->num_trace_events;
 
 	for_each_event(call, start, end) {
-		__register_event(*call, mod);
-		__add_event_to_tracers(*call);
+		if (!__register_event(*call, mod))
+			__add_event_to_tracers(*call);
 	}
 
 	update_cache_events(mod);
author maintainer
#2 lore raw

PATCH 2/2 tracing/filters: Fix false positive match in regex_match_full()

In reply to Masami Hiramatsu (Google)

From: Masami Hiramatsu (Google) <[email protected]>

regex_match_full() calls strncmp(str, r->pattern, len) where len is the target field buffer size. When len is smaller than r->len (the filter pattern length), strncmp() checks only len bytes of r->pattern against str. If those len bytes match, strncmp() returns 0, resulting in a false-positive match where a shorter string in a fixed-size field matches a longer filter pattern.

For example, a 4-byte static string field containing "abcd" matched the filter pattern "abcdefgh" because strncmp("abcd", "abcdefgh", 4) returned 0. In this case, @len does NOT include '\0' because it is fixed-size array.

Fix this by returning 0 (no match) early when len < r->len.

Fixes 1889d20922d1 ("tracing/filters: Provide basic regex support")
Assisted-by Antigravity:gemini-3.5-flash
---
 kernel/trace/trace_events_filter.c |    3 +++
 1 file changed, 3 insertions(+)
kernel/trace/trace_events_filter.c +3 -0
index 6385cd662d8d..2b46ca536045 100644
@@ -1027,6 +1027,9 @@ static int regex_match_full(char *str, struct regex *r, int len)
 	if (!len)
 		return strcmp(str, r->pattern) == 0;
 
+	if (len < r->len)
+		return 0;
+
 	return strncmp(str, r->pattern, len) == 0;
 }