Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf test: Free formats for perf pmu parse test

The following leaks were detected by ASAN:

Indirect leak of 360 byte(s) in 9 object(s) allocated from:
#0 0x7fecc305180e in calloc (/lib/x86_64-linux-gnu/libasan.so.5+0x10780e)
#1 0x560578f6dce5 in perf_pmu__new_format util/pmu.c:1333
#2 0x560578f752fc in perf_pmu_parse util/pmu.y:59
#3 0x560578f6a8b7 in perf_pmu__format_parse util/pmu.c:73
#4 0x560578e07045 in test__pmu tests/pmu.c:155
#5 0x560578de109b in run_test tests/builtin-test.c:410
#6 0x560578de109b in test_and_print tests/builtin-test.c:440
#7 0x560578de401a in __cmd_test tests/builtin-test.c:661
#8 0x560578de401a in cmd_test tests/builtin-test.c:807
#9 0x560578e49354 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:312
#10 0x560578ce71a8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:364
#11 0x560578ce71a8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:408
#12 0x560578ce71a8 in main /home/namhyung/project/linux/tools/perf/perf.c:538
#13 0x7fecc2b7acc9 in __libc_start_main ../csu/libc-start.c:308

Fixes: cff7f956ec4a1 ("perf tests: Move pmu tests into separate object")
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20200915031819.386559-12-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Namhyung Kim and committed by
Arnaldo Carvalho de Melo
d26383dc 6f47ed6c

+13
+1
tools/perf/tests/pmu.c
··· 173 173 ret = 0; 174 174 } while (0); 175 175 176 + perf_pmu__del_formats(&formats); 176 177 test_format_dir_put(format); 177 178 return ret; 178 179 }
+11
tools/perf/util/pmu.c
··· 1354 1354 set_bit(b, bits); 1355 1355 } 1356 1356 1357 + void perf_pmu__del_formats(struct list_head *formats) 1358 + { 1359 + struct perf_pmu_format *fmt, *tmp; 1360 + 1361 + list_for_each_entry_safe(fmt, tmp, formats, list) { 1362 + list_del(&fmt->list); 1363 + free(fmt->name); 1364 + free(fmt); 1365 + } 1366 + } 1367 + 1357 1368 static int sub_non_neg(int a, int b) 1358 1369 { 1359 1370 if (b > a)
+1
tools/perf/util/pmu.h
··· 94 94 int config, unsigned long *bits); 95 95 void perf_pmu__set_format(unsigned long *bits, long from, long to); 96 96 int perf_pmu__format_parse(char *dir, struct list_head *head); 97 + void perf_pmu__del_formats(struct list_head *formats); 97 98 98 99 struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu); 99 100