Skip to content

Commit 6f86bde

Browse files
committed
tracing: Fix bad hist from corrupting named_triggers list
The following commands causes a crash: ~# cd /sys/kernel/tracing/events/rcu/rcu_callback ~# echo 'hist:name=bad:keys=common_pid:onmax(bogus).save(common_pid)' > trigger bash: echo: write error: Invalid argument ~# echo 'hist:name=bad:keys=common_pid' > trigger Because the following occurs: event_trigger_write() { trigger_process_regex() { event_hist_trigger_parse() { data = event_trigger_alloc(..); event_trigger_register(.., data) { cmd_ops->reg(.., data, ..) [hist_register_trigger()] { data->ops->init() [event_hist_trigger_init()] { save_named_trigger(name, data) { list_add(&data->named_list, &named_triggers); } } } } ret = create_actions(); (return -EINVAL) if (ret) goto out_unreg; [..] ret = hist_trigger_enable(data, ...) { list_add_tail_rcu(&data->list, &file->triggers); <<<---- SKIPPED!!! (this is important!) [..] out_unreg: event_hist_unregister(.., data) { cmd_ops->unreg(.., data, ..) [hist_unregister_trigger()] { list_for_each_entry(iter, &file->triggers, list) { if (!hist_trigger_match(data, iter, named_data, false)) <- never matches continue; [..] test = iter; } if (test && test->ops->free) <<<-- test is NULL test->ops->free(test) [event_hist_trigger_free()] { [..] if (data->name) del_named_trigger(data) { list_del(&data->named_list); <<<<-- NEVER gets removed! } } } } [..] kfree(data); <<<-- frees item but it is still on list The next time a hist with name is registered, it causes an u-a-f bug and the kernel can crash. Move the code around such that if event_trigger_register() succeeds, the next thing called is hist_trigger_enable() which adds it to the list. A bunch of actions is called if get_named_trigger_data() returns false. But that doesn't need to be called after event_trigger_register(), so it can be moved up, allowing event_trigger_register() to be called just before hist_trigger_enable() keeping them together and allowing the file->triggers to be properly populated. Cc: stable@vger.kernel.org Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Link: https://lore.kernel.org/20250227163944.1c37f85f@gandalf.local.home Fixes: 067fe03 ("tracing: Add variable reference handling to hist triggers") Reported-by: Tomas Glozar <tglozar@redhat.com> Tested-by: Tomas Glozar <tglozar@redhat.com> Reviewed-by: Tom Zanussi <zanussi@kernel.org> Closes: https://lore.kernel.org/all/CAP4=nvTsxjckSBTz=Oe_UYh8keD9_sZC4i++4h72mJLic4_W4A@mail.gmail.com/ Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent d082ecb commit 6f86bde

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

kernel/trace/trace_events_hist.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6724,27 +6724,27 @@ static int event_hist_trigger_parse(struct event_command *cmd_ops,
67246724
if (existing_hist_update_only(glob, trigger_data, file))
67256725
goto out_free;
67266726

6727-
ret = event_trigger_register(cmd_ops, file, glob, trigger_data);
6728-
if (ret < 0)
6729-
goto out_free;
6727+
if (!get_named_trigger_data(trigger_data)) {
67306728

6731-
if (get_named_trigger_data(trigger_data))
6732-
goto enable;
6729+
ret = create_actions(hist_data);
6730+
if (ret)
6731+
goto out_free;
67336732

6734-
ret = create_actions(hist_data);
6735-
if (ret)
6736-
goto out_unreg;
6733+
if (has_hist_vars(hist_data) || hist_data->n_var_refs) {
6734+
ret = save_hist_vars(hist_data);
6735+
if (ret)
6736+
goto out_free;
6737+
}
67376738

6738-
if (has_hist_vars(hist_data) || hist_data->n_var_refs) {
6739-
ret = save_hist_vars(hist_data);
6739+
ret = tracing_map_init(hist_data->map);
67406740
if (ret)
6741-
goto out_unreg;
6741+
goto out_free;
67426742
}
67436743

6744-
ret = tracing_map_init(hist_data->map);
6745-
if (ret)
6746-
goto out_unreg;
6747-
enable:
6744+
ret = event_trigger_register(cmd_ops, file, glob, trigger_data);
6745+
if (ret < 0)
6746+
goto out_free;
6747+
67486748
ret = hist_trigger_enable(trigger_data, file);
67496749
if (ret)
67506750
goto out_unreg;

0 commit comments

Comments
 (0)