Skip to content

Commit 33e2074

Browse files
rostedtgregkh
authored andcommitted
tracing: Add down_write(trace_event_sem) when adding trace event
commit b5e8acc upstream. When a module is loaded, it adds trace events defined by the module. It may also need to modify the modules trace printk formats to replace enum names with their values. If two modules are loaded at the same time, the adding of the event to the ftrace_events list can corrupt the walking of the list in the code that is modifying the printk format strings and crash the kernel. The addition of the event should take the trace_event_sem for write while it adds the new event. Also add a lockdep_assert_held() on that semaphore in __trace_add_event_dirs() as it iterates the list. Cc: stable@vger.kernel.org Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Link: https://lore.kernel.org/20250718223158.799bfc0c@batman.local.home Reported-by: Fusheng Huang(黄富生) <Fusheng.Huang@luxshare-ict.com> Closes: https://lore.kernel.org/all/20250717105007.46ccd18f@batman.local.home/ Fixes: 110bf2b ("tracing: add protection around module events unload") Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 692cfff commit 33e2074

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

kernel/trace/trace_events.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2879,7 +2879,10 @@ __register_event(struct trace_event_call *call, struct module *mod)
28792879
if (ret < 0)
28802880
return ret;
28812881

2882+
down_write(&trace_event_sem);
28822883
list_add(&call->list, &ftrace_events);
2884+
up_write(&trace_event_sem);
2885+
28832886
if (call->flags & TRACE_EVENT_FL_DYNAMIC)
28842887
atomic_set(&call->refcnt, 0);
28852888
else
@@ -3471,6 +3474,8 @@ __trace_add_event_dirs(struct trace_array *tr)
34713474
struct trace_event_call *call;
34723475
int ret;
34733476

3477+
lockdep_assert_held(&trace_event_sem);
3478+
34743479
list_for_each_entry(call, &ftrace_events, list) {
34753480
ret = __trace_add_new_event(call, tr);
34763481
if (ret < 0)

0 commit comments

Comments
 (0)