Skip to content

Commit 17f228c

Browse files
rostedtedoardocanepa
authored andcommitted
tracing: Add down_write(trace_event_sem) when adding trace event
BugLink: https://bugs.launchpad.net/bugs/2123805 commit b5e8acc14dcb314a9b61ff19dcd9fdd0d88f70df 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: [email protected] Cc: Mathieu Desnoyers <[email protected]> Acked-by: Masami Hiramatsu (Google) <[email protected]> Link: https://lore.kernel.org/[email protected] Reported-by: Fusheng Huang(黄富生) <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Fixes: 110bf2b ("tracing: add protection around module events unload") Signed-off-by: Steven Rostedt (Google) <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Noah Wager <[email protected]> Signed-off-by: Edoardo Canepa <[email protected]>
1 parent e5c3484 commit 17f228c

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
@@ -3109,7 +3109,10 @@ __register_event(struct trace_event_call *call, struct module *mod)
31093109
if (ret < 0)
31103110
return ret;
31113111

3112+
down_write(&trace_event_sem);
31123113
list_add(&call->list, &ftrace_events);
3114+
up_write(&trace_event_sem);
3115+
31133116
if (call->flags & TRACE_EVENT_FL_DYNAMIC)
31143117
atomic_set(&call->refcnt, 0);
31153118
else
@@ -3723,6 +3726,8 @@ __trace_add_event_dirs(struct trace_array *tr)
37233726
struct trace_event_call *call;
37243727
int ret;
37253728

3729+
lockdep_assert_held(&trace_event_sem);
3730+
37263731
list_for_each_entry(call, &ftrace_events, list) {
37273732
ret = __trace_add_new_event(call, tr);
37283733
if (ret < 0)

0 commit comments

Comments
 (0)