Skip to content

Commit 5ecab78

Browse files
captain5050acmel
authored andcommitted
perf lock: Avoid memory leaks from strdup()
Leak sanitizer complains about the strdup-ed arguments not being freed and given cmd_record doesn't modify the given strings, remove the strdups. Original discussion in this patch: https://lore.kernel.org/lkml/20240430184156.1824083-1-irogers@google.com/ Suggested-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: zhaimingbing <zhaimingbing@cmss.chinamobile.com> Link: https://lore.kernel.org/r/20240509053123.1918093-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 6fe61cb commit 5ecab78

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

tools/perf/builtin-lock.c

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2275,23 +2275,13 @@ static int __cmd_record(int argc, const char **argv)
22752275
return -ENOMEM;
22762276

22772277
for (i = 0; i < ARRAY_SIZE(record_args); i++)
2278-
rec_argv[i] = strdup(record_args[i]);
2278+
rec_argv[i] = record_args[i];
22792279

22802280
for (j = 0; j < nr_tracepoints; j++) {
2281-
const char *ev_name;
2282-
2283-
if (has_lock_stat)
2284-
ev_name = strdup(lock_tracepoints[j].name);
2285-
else
2286-
ev_name = strdup(contention_tracepoints[j].name);
2287-
2288-
if (!ev_name) {
2289-
free(rec_argv);
2290-
return -ENOMEM;
2291-
}
2292-
22932281
rec_argv[i++] = "-e";
2294-
rec_argv[i++] = ev_name;
2282+
rec_argv[i++] = has_lock_stat
2283+
? lock_tracepoints[j].name
2284+
: contention_tracepoints[j].name;
22952285
}
22962286

22972287
for (j = 0; j < nr_callgraph_args; j++, i++)

0 commit comments

Comments
 (0)