| From b31d2996dfbd038cbf264b24eb3a5a5abca32145 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 15 Jul 2021 18:07:13 +0200 |
| Subject: perf env: Fix memory leak of cpu_pmu_caps |
| |
| From: Riccardo Mancini <rickyman7@gmail.com> |
| |
| [ Upstream commit da6b7c6c0626901428245f65712385805e42eba6 ] |
| |
| ASan reports memory leaks while running: |
| |
| # perf test "83: Zstd perf.data compression/decompression" |
| |
| The first of the leaks is caused by env->cpu_pmu_caps not being freed. |
| |
| This patch adds the missing (z)free inside perf_env__exit. |
| |
| Signed-off-by: Riccardo Mancini <rickyman7@gmail.com> |
| Fixes: 6f91ea283a1ed23e ("perf header: Support CPU PMU capabilities") |
| Cc: Ian Rogers <irogers@google.com> |
| Cc: Jiri Olsa <jolsa@redhat.com> |
| Cc: Kan Liang <kan.liang@linux.intel.com> |
| Cc: Mark Rutland <mark.rutland@arm.com> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Link: http://lore.kernel.org/lkml/6ba036a8220156ec1f3d6be3e5d25920f6145028.1626343282.git.rickyman7@gmail.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/perf/util/env.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c |
| index f3b90412cc70..16a111b62cc3 100644 |
| --- a/tools/perf/util/env.c |
| +++ b/tools/perf/util/env.c |
| @@ -191,6 +191,7 @@ void perf_env__exit(struct perf_env *env) |
| zfree(&env->sibling_threads); |
| zfree(&env->pmu_mappings); |
| zfree(&env->cpu); |
| + zfree(&env->cpu_pmu_caps); |
| zfree(&env->numa_map); |
| |
| for (i = 0; i < env->nr_numa_nodes; i++) |
| -- |
| 2.30.2 |
| |