Skip to content

Commit 80f0d63

Browse files
GoodLuck612rostedt
authored andcommitted
tracing: Fix memory leaks in create_field_var()
The function create_field_var() allocates memory for 'val' through create_hist_field() inside parse_atom(), and for 'var' through create_var(), which in turn allocates var->type and var->var.name internally. Simply calling kfree() to release these structures will result in memory leaks. Use destroy_hist_field() to properly free 'val', and explicitly release the memory of var->type and var->var.name before freeing 'var' itself. Link: https://patch.msgid.link/[email protected] Fixes: 02205a6 ("tracing: Add support for 'field variables'") Signed-off-by: Zilin Guan <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent aa997d2 commit 80f0d63

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

kernel/trace/trace_events_hist.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3272,14 +3272,16 @@ static struct field_var *create_field_var(struct hist_trigger_data *hist_data,
32723272
var = create_var(hist_data, file, field_name, val->size, val->type);
32733273
if (IS_ERR(var)) {
32743274
hist_err(tr, HIST_ERR_VAR_CREATE_FIND_FAIL, errpos(field_name));
3275-
kfree(val);
3275+
destroy_hist_field(val, 0);
32763276
ret = PTR_ERR(var);
32773277
goto err;
32783278
}
32793279

32803280
field_var = kzalloc(sizeof(struct field_var), GFP_KERNEL);
32813281
if (!field_var) {
3282-
kfree(val);
3282+
destroy_hist_field(val, 0);
3283+
kfree_const(var->type);
3284+
kfree(var->var.name);
32833285
kfree(var);
32843286
ret = -ENOMEM;
32853287
goto err;

0 commit comments

Comments
 (0)