]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
tracing: Check return value of __register_event() in trace_module_add_events()
authorMasami Hiramatsu (Google) <mhiramat@kernel.org>
Wed, 29 Jul 2026 00:27:58 +0000 (09:27 +0900)
committerSteven Rostedt <rostedt@goodmis.org>
Wed, 29 Jul 2026 18:32:11 +0000 (14:32 -0400)
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")
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/178528487878.124250.14170824576025743236.stgit@devnote2
Assisted-by: Antigravity:gemini-3.5-flash
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
kernel/trace/trace_events.c

index 956692856fa822e1e29857d43a6ea1a8b5be6f17..c01b10b99f67e5e7b936f15578c298f057ba75f3 100644 (file)
@@ -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);