perf test: Free formats for perf pmu parse test

[ Upstream commit d26383d ]

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)
    hardkernel#1 0x560578f6dce5 in perf_pmu__new_format util/pmu.c:1333
    hardkernel#2 0x560578f752fc in perf_pmu_parse util/pmu.y:59
    hardkernel#3 0x560578f6a8b7 in perf_pmu__format_parse util/pmu.c:73
    hardkernel#4 0x560578e07045 in test__pmu tests/pmu.c:155
    hardkernel#5 0x560578de109b in run_test tests/builtin-test.c:410
    hardkernel#6 0x560578de109b in test_and_print tests/builtin-test.c:440
    hardkernel#7 0x560578de401a in __cmd_test tests/builtin-test.c:661
    hardkernel#8 0x560578de401a in cmd_test tests/builtin-test.c:807
    hardkernel#9 0x560578e49354 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:312
    hardkernel#10 0x560578ce71a8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:364
    hardkernel#11 0x560578ce71a8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:408
    hardkernel#12 0x560578ce71a8 in main /home/namhyung/project/linux/tools/perf/perf.c:538
    hardkernel#13 0x7fecc2b7acc9 in __libc_start_main ../csu/libc-start.c:308

Fixes: cff7f95 ("perf tests: Move pmu tests into separate object")
Signed-off-by: Namhyung Kim <[email protected]>
Acked-by: Jiri Olsa <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: Ian Rogers <[email protected]>
Cc: Mark Rutland <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>

Author: namhyung

tools/perf/tests/pmu.c

@@ -173,6 +173,7 @@ int test__pmu(struct test *test __maybe_unused, int subtest __maybe_unused)
 		ret = 0;
 	} while (0);
 
+	perf_pmu__del_formats(&formats);
 	test_format_dir_put(format);
 	return ret;
 }

tools/perf/util/pmu.c

@@ -1352,6 +1352,17 @@ void perf_pmu__set_format(unsigned long *bits, long from, long to)
 		set_bit(b, bits);
 }
 
+void perf_pmu__del_formats(struct list_head *formats)
+{
+	struct perf_pmu_format *fmt, *tmp;
+
+	list_for_each_entry_safe(fmt, tmp, formats, list) {
+		list_del(&fmt->list);
+		free(fmt->name);
+		free(fmt);
+	}
+}
+
 static int sub_non_neg(int a, int b)
 {
 	if (b > a)

tools/perf/util/pmu.h

@@ -92,6 +92,7 @@ int perf_pmu__new_format(struct list_head *list, char *name,
 			 int config, unsigned long *bits);
 void perf_pmu__set_format(unsigned long *bits, long from, long to);
 int perf_pmu__format_parse(char *dir, struct list_head *head);
+void perf_pmu__del_formats(struct list_head *formats);
 
 struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu);