]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tracing: Add NULL pointer check to trigger_data_free()
authorGuenter Roeck <linux@roeck-us.net>
Thu, 5 Mar 2026 19:33:39 +0000 (11:33 -0800)
committerSasha Levin <sashal@kernel.org>
Thu, 12 Mar 2026 11:10:01 +0000 (07:10 -0400)
[ Upstream commit 457965c13f0837a289c9164b842d0860133f6274 ]

If trigger_data_alloc() fails and returns NULL, event_hist_trigger_parse()
jumps to the out_free error path. While kfree() safely handles a NULL
pointer, trigger_data_free() does not. This causes a NULL pointer
dereference in trigger_data_free() when evaluating
data->cmd_ops->set_filter.

Fix the problem by adding a NULL pointer check to trigger_data_free().

The problem was found by an experimental code review agent based on
gemini-3.1-pro while reviewing backports into v6.18.y.

Cc: Miaoqian Lin <linmq006@gmail.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Steven Rostedt (Google) <rostedt@goodmis.org>
Link: https://patch.msgid.link/20260305193339.2810953-1-linux@roeck-us.net
Fixes: 0550069cc25f ("tracing: Properly process error handling in event_hist_trigger_parse()")
Assisted-by: Gemini:gemini-3.1-pro
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/trace/trace_events_trigger.c

index 06b75bcfc7b8b0017e70e2bb30df0aac6597ab7c..871e7a99d03cbb126fb89a4b2f65c8c2feed0ddc 100644 (file)
@@ -50,6 +50,9 @@ static int trigger_kthread_fn(void *ignore)
 
 void trigger_data_free(struct event_trigger_data *data)
 {
+       if (!data)
+               return;
+
        if (data->cmd_ops->set_filter)
                data->cmd_ops->set_filter(NULL, data, NULL);