Skip to contentSkip to conversation

tracing: fix double free

PATCH In review [email protected] 2 participants 2 messages Sep 7, 2020 – Sep 8, 2020 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tracing: fix double free

From: Tom Rix <[email protected]>

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().

Fixes 30350d65ac56 ("tracing: Add variable support to hist triggers")
---
 kernel/trace/trace_events_hist.c | 1 -
 1 file changed, 1 deletion(-)
kernel/trace/trace_events_hist.c +0 -1
index 0b933546142e..1b2ef6490229 100644
@@ -3865,7 +3865,6 @@ static int parse_var_defs(struct hist_trigger_data *hist_data)
 
 			s = kstrdup(field_str, GFP_KERNEL);
 			if (!s) {
-				kfree(hist_data->attrs->var_defs.name[n_vars]);
 				ret = -ENOMEM;
 				goto free;
 			}
Signature · 1 line
2.18.1
Reviewed-by on v1 1/1
#1 lore raw

Hi Tom,

Quoted 13 lines · On 9/7/2020 8:58 AM, [email protected] wrote:

From: Tom Rix <[email protected]>

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.

Quoted 5 lines

Because free_var_defs() has to run anyway, remove the second free fom parse_var_defs().

Fixes 30350d65ac56 ("tracing: Add variable support to hist triggers")

Good catch, thanks for fixing this!

Quoted 17 lines
---
  kernel/trace/trace_events_hist.c | 1 -
  1 file changed, 1 deletion(-)
kernel/trace/trace_events_hist.c +0 -1
index 0b933546142e..1b2ef6490229 100644
@@ -3865,7 +3865,6 @@ static int parse_var_defs(struct hist_trigger_data *hist_data)
 
  			s = kstrdup(field_str, GFP_KERNEL);
  			if (!s) {
-				kfree(hist_data->attrs->var_defs.name[n_vars]);
  				ret = -ENOMEM;
  				goto free;
  			}