Skip to content

Commit 46bbe5c

Browse files
Tom Rixrostedt
authored andcommitted
tracing: fix double free
clang static analyzer reports this problem trace_events_hist.c:3824:3: warning: Attempt to free released memory kfree(hist_data->attrs->var_defs.name[i]); In parse_var_defs() if there is a problem allocating var_defs.expr, the earlier var_defs.name is freed. This free is duplicated by free_var_defs() which frees the rest of the list. Because free_var_defs() has to run anyway, remove the second free fom parse_var_defs(). Link: https://lkml.kernel.org/r/[email protected] Cc: [email protected] Fixes: 30350d6 ("tracing: Add variable support to hist triggers") Reviewed-by: Tom Zanussi <[email protected]> Signed-off-by: Tom Rix <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent 54fa9ba commit 46bbe5c

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

kernel/trace/trace_events_hist.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3865,7 +3865,6 @@ static int parse_var_defs(struct hist_trigger_data *hist_data)
38653865

38663866
s = kstrdup(field_str, GFP_KERNEL);
38673867
if (!s) {
3868-
kfree(hist_data->attrs->var_defs.name[n_vars]);
38693868
ret = -ENOMEM;
38703869
goto free;
38713870
}

0 commit comments

Comments
 (0)