in case trigger_data_alloc return NULL (trace_events_hist.c:6526)
→ goto out_free
→ event_trigger_reset_filter(cmd_ops, NULL) (trace_events_hist.c:6593)
→ set_trigger_filter(NULL, NULL, NULL) (trace_events_trigger.c:917)
→ filter_str == NULL, goto assign (trace_events_trigger.c:1080)
→ data->filter с data == NULL (trace_events_trigger.c:1086)
it will
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: 4b147936fa50 ("tracing: Add support for 'synthetic' events")
Signed-off-by: Alexander Konyukhov <Alexander.Konyukhov@kaspersky.com>
---
kernel/trace/trace_events_hist.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 336fc54d8ec8..9d203ab56fac 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -6525,7 +6525,7 @@ static int event_hist_trigger_parse(struct event_command *cmd_ops,
trigger_data = trigger_data_alloc(cmd_ops, cmd, param, hist_data);
if (!trigger_data) {
ret = -ENOMEM;
- goto out_free;
+ goto out_hist_data;
}
ret = event_trigger_set_filter(cmd_ops, file, filter, trigger_data);
@@ -6591,6 +6591,7 @@ static int event_hist_trigger_parse(struct event_command *cmd_ops,
event_trigger_unregister(cmd_ops, file, glob+1, trigger_data);
out_free:
event_trigger_reset_filter(cmd_ops, trigger_data);
+ out_hist_data:
remove_hist_vars(hist_data);
--
2.43.0