perf trace: Fix evlist memory leak
authorIan Rogers <irogers@google.com>
Wed, 19 Mar 2025 05:07:41 +0000 (22:07 -0700)
committerNamhyung Kim <namhyung@kernel.org>
Fri, 21 Mar 2025 05:58:35 +0000 (22:58 -0700)
Leak sanitizer was reporting a memory leak in the "perf record and
replay" test. Add evlist__delete to trace__exit, also ensure
trace__exit is called after trace__record.

Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Link: https://lore.kernel.org/r/20250319050741.269828-15-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
tools/perf/builtin-trace.c

index 1d4ad5d19b100c64f68fec6deca5dd66b6295c73..a102748bd0c9d577ee491cfb07b6f792300b49a1 100644 (file)
@@ -5339,6 +5339,8 @@ static void trace__exit(struct trace *trace)
                zfree(&trace->syscalls.table);
        }
        zfree(&trace->perfconfig_events);
+       evlist__delete(trace->evlist);
+       trace->evlist = NULL;
 #ifdef HAVE_LIBBPF_SUPPORT
        btf__free(trace->btf);
        trace->btf = NULL;
@@ -5719,8 +5721,10 @@ init_augmented_syscall_tp:
                }
        }
 
-       if ((argc >= 1) && (strcmp(argv[0], "record") == 0))
-               return trace__record(&trace, argc-1, &argv[1]);
+       if ((argc >= 1) && (strcmp(argv[0], "record") == 0)) {
+               err = trace__record(&trace, argc-1, &argv[1]);
+               goto out;
+       }
 
        /* Using just --errno-summary will trigger --summary */
        if (trace.errno_summary && !trace.summary && !trace.summary_only)