Skip to content

Commit 9df61cd

Browse files
tracing: Fix error handling in event_trigger_parse()
JIRA: https://issues.redhat.com/browse/RHEL-115358 commit c5dd28e Author: Miaoqian Lin <linmq006@gmail.com> Date: Wed May 7 10:53:07 2025 -0400 tracing: Fix error handling in event_trigger_parse() According to trigger_data_alloc() doc, trigger_data_free() should be used to free an event_trigger_data object. This fixes a mismatch introduced when kzalloc was replaced with trigger_data_alloc without updating the corresponding deallocation calls. Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Tom Zanussi <zanussi@kernel.org> Link: https://lore.kernel.org/20250507145455.944453325@goodmis.org Link: https://lore.kernel.org/20250318112737.4174-1-linmq006@gmail.com Fixes: e1f187d ("tracing: Have existing event_command.parse() implementations use helpers") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> [ SDR: Changed event_trigger_alloc/free() to trigger_data_alloc/free() ] Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
1 parent 2935d6f commit 9df61cd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/trace/trace_events_trigger.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ event_trigger_parse(struct event_command *cmd_ops,
10161016

10171017
if (remove) {
10181018
event_trigger_unregister(cmd_ops, file, glob+1, trigger_data);
1019-
kfree(trigger_data);
1019+
trigger_data_free(trigger_data);
10201020
ret = 0;
10211021
goto out;
10221022
}
@@ -1043,7 +1043,7 @@ event_trigger_parse(struct event_command *cmd_ops,
10431043

10441044
out_free:
10451045
event_trigger_reset_filter(cmd_ops, trigger_data);
1046-
kfree(trigger_data);
1046+
trigger_data_free(trigger_data);
10471047
goto out;
10481048
}
10491049

0 commit comments

Comments
 (0)