unimore/kernel-hacking-2024-linux-steffo
unimore/kernel-hacking-2024-linux-steffo
1
Fork 0
Code Pull requests 5 Wiki Activity

tracing: Fix possible memory leak in __create_synth_event() error path

Browse source 
There's error paths in __create_synth_event() after the argv is allocated
that fail to free it. Add a jump to free it when necessary.

Link: https://lkml.kernel.org/r/20211209024317.11783-1-linmq006@gmail.com

Suggested-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
[ Fixed up the patch and change log ]
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Miaoqian Lin 2021-12-09 02:43:17 +00:00 committed by Steven Rostedt (VMware)
parent e1067a07cf
commit c24be24aed
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kernel/trace/trace_events_synth.c
View file

@ -1237,9 +1237,8 @@ static int __create_synth_event(const char *name, const char *raw_fields)
argv + consumed, &consumed, argv + consumed, &consumed,
&field_version); &field_version);
if (IS_ERR(field)) { if (IS_ERR(field)) {
argv_free(argv);
ret = PTR_ERR(field); ret = PTR_ERR(field);
goto err; goto err_free_arg;
} }
/* /*
@ -1262,18 +1261,19 @@ static int __create_synth_event(const char *name, const char *raw_fields)
if (cmd_version > 1 && n_fields_this_loop >= 1) { if (cmd_version > 1 && n_fields_this_loop >= 1) {
synth_err(SYNTH_ERR_INVALID_CMD, errpos(field_str)); synth_err(SYNTH_ERR_INVALID_CMD, errpos(field_str));
ret = -EINVAL; ret = -EINVAL;
goto err; goto err_free_arg;
} }
fields[n_fields++] = field; fields[n_fields++] = field;
if (n_fields == SYNTH_FIELDS_MAX) { if (n_fields == SYNTH_FIELDS_MAX) {
synth_err(SYNTH_ERR_TOO_MANY_FIELDS, 0); synth_err(SYNTH_ERR_TOO_MANY_FIELDS, 0);
ret = -EINVAL; ret = -EINVAL;
goto err; goto err_free_arg;
} }
n_fields_this_loop++; n_fields_this_loop++;
} }
argv_free(argv);
if (consumed < argc) { if (consumed < argc) {
synth_err(SYNTH_ERR_INVALID_CMD, 0); synth_err(SYNTH_ERR_INVALID_CMD, 0);
@ -1281,7 +1281,6 @@ static int __create_synth_event(const char *name, const char *raw_fields)
goto err; goto err;
} }
argv_free(argv);
} }
if (n_fields == 0) { if (n_fields == 0) {
@ -1307,6 +1306,8 @@ static int __create_synth_event(const char *name, const char *raw_fields)
kfree(saved_fields); kfree(saved_fields);
return ret; return ret;
err_free_arg:
argv_free(argv);
err: err:
for (i = 0; i < n_fields; i++) for (i = 0; i < n_fields; i++)
free_synth_field(fields[i]); free_synth_field(fields[i]);