perf script: Fix possible memory leaks
Namhyung Kim
maintainerPATCH 1/1 perf script: Fix possible memory leaks
Some paths in perf script don't call perf_session__delete() after creating a new session.
--- tools/perf/builtin-script.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)
tools/perf/builtin-script.c +18 -13
@@ -1476,7 +1476,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)struct perf_session *session;char *script_path =NULL ;const char **__argv; -int i, j, err; +int i, j, err =0 ;struct perf_script script = { .tool = { .sample = process_sample_event,
@@ -1730,14 +1730,15 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)if (header || header_only) {perf_session__fprintf_info (session, stdout, show_full_info);if (header_only) -return 0 ; + goto out_delete; } script.session = session;if (cpu_list) { -if (perf_session__cpu_bitmap (session, cpu_list, cpu_bitmap)) -return -1 ; + err =perf_session__cpu_bitmap (session, cpu_list, cpu_bitmap); +if (err <0 ) + goto out_delete; }if (!no_callchain)
@@ -1752,53 +1753,57 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)if (output_set_by_user ()) {fprintf (stderr,"custom fields not supported for generated scripts" ); -return -1 ; + err = -EINVAL ; + goto out_delete; } input =open (file.path,O_RDONLY );/* input_name */ if (input <0 ) {perror ("failed to open file" ); -return -1 ; + err = -errno; + goto out_delete; } err =fstat (input, &perf_stat);if (err <0 ) {perror ("failed to stat file" ); -return -1 ; + goto out_delete; }if (!perf_stat.st_size) {fprintf (stderr,"zero-sized file, nothing to do!\n" ); -return 0 ; + goto out_delete; } scripting_ops =script_spec__lookup (generate_script_lang);if (!scripting_ops) {fprintf (stderr,"invalid language specifier" ); -return -1 ; + err = -ENOENT ; + goto out_delete; } err = scripting_ops->generate_script (session->tevent.pevent,"perf-script" ); - goto out; + goto out_delete; }if (script_name) { err = scripting_ops->start_script (script_name, argc, argv);if (err) - goto out; + goto out_delete;pr_debug ("perf script started with script %s\n\n" , script_name); } err =perf_session__check_output_opt (session);if (err <0 ) - goto out; + goto out_delete; err =__cmd_script (&script); -perf_session__delete (session);cleanup_scripting (); +out_delete: +perf_session__delete (session); out:return err; }
Signature · 1 line
2.0.0
Adrian Hunter
reviewerQuoted 94 lines · Namhyung Kim
Some paths in perf script don't call
perf_session__delete()after creating a new session.Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/builtin-script.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)tools/perf/builtin-script.c +15
-11@@ -1476,7 +1476,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)struct perf_session *session;char *script_path =NULL ;const char **__argv; -int i, j, err; +int i, j, err =0 ;struct perf_script script = { .tool = { .sample = process_sample_event,@@ -1730,14 +1730,15 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)if (header || header_only) {perf_session__fprintf_info (session, stdout, show_full_info);if (header_only) -return 0 ; + goto out_delete; } script.session = session;if (cpu_list) { -if (perf_session__cpu_bitmap (session, cpu_list, cpu_bitmap)) -return -1 ; + err =perf_session__cpu_bitmap (session, cpu_list, cpu_bitmap); +if (err <0 ) + goto out_delete; }if (!no_callchain)@@ -1752,53 +1753,57 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)if (output_set_by_user ()) {fprintf (stderr,"custom fields not supported for generated scripts" ); -return -1 ; + err = -EINVAL ; + goto out_delete; } input =open (file.path,O_RDONLY );/* input_name */ if (input <0 ) {perror ("failed to open file" ); -return -1 ; + err = -errno; + goto out_delete; } err =fstat (input, &perf_stat);if (err <0 ) {perror ("failed to stat file" ); -return -1 ; + goto out_delete; }if (!perf_stat.st_size) {fprintf (stderr,"zero-sized file, nothing to do!\n" ); -return 0 ; + goto out_delete; } scripting_ops =script_spec__lookup (generate_script_lang);if (!scripting_ops) {fprintf (stderr,"invalid language specifier" ); -return -1 ; + err = -ENOENT ; + goto out_delete; } err = scripting_ops->generate_script (session->tevent.pevent,"perf-script" ); - goto out; + goto out_delete; }if (script_name) { err = scripting_ops->start_script (script_name, argc, argv);if (err) - goto out; + goto out_delete;pr_debug ("perf script started with script %s\n\n" , script_name); } err =perf_session__check_output_opt (session);
tools/perf/builtin-script.c int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) · line 1806
Quoted 10 lines
tools/perf/builtin-script.c +3
-2if (err <0 ) - goto out; + goto out_delete; err =__cmd_script (&script); -perf_session__delete (session);cleanup_scripting (); +out_delete: +perf_session__delete (session);
Some of the db-export scripting I do relies on the session being deleted before the script is stopped. I would prefer the original order i.e. perf_session__delete() then cleanup_scripting()
Namhyung Kim
maintainerHi Adrian,
Quoted 4 lines · Adrian Hunter
Quoted 3 lines · Namhyung Kim
Some paths in perf script don't call
perf_session__delete()after creating a new session.
[SNIP]
Quoted 9 lines
tools/perf/builtin-script.c int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) · line 1806
Quoted 4 lines
tools/perf/builtin-script.c +2
-1-perf_session__delete (session);cleanup_scripting (); +out_delete: +perf_session__delete (session);Some of the db-export scripting I do relies on the session being deleted before the script is stopped. I would prefer the original order i.e.
perf_session__delete()thencleanup_scripting()
Okay, I'll fix it and send v2.
Thanks,
Namhyung