| From 85e6a9028253e29b3af7d1704d6398d008ba301d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 15 Jul 2021 18:07:07 +0200 |
| Subject: perf env: Fix sibling_dies memory leak |
| |
| From: Riccardo Mancini <rickyman7@gmail.com> |
| |
| [ Upstream commit 42db3d9ded555f7148b5695109a7dc8d66f0dde4 ] |
| |
| ASan reports a memory leak in perf_env while running: |
| |
| # perf test "41: Session topology" |
| |
| Caused by sibling_dies not being freed. |
| |
| This patch adds the required free. |
| |
| Fixes: acae8b36cded0ee6 ("perf header: Add die information in CPU topology") |
| Signed-off-by: Riccardo Mancini <rickyman7@gmail.com> |
| Cc: Ian Rogers <irogers@google.com> |
| Cc: Jiri Olsa <jolsa@redhat.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/2140d0b57656e4eb9021ca9772250c24c032924b.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 bc5e4f294e9e..f3b90412cc70 100644 |
| --- a/tools/perf/util/env.c |
| +++ b/tools/perf/util/env.c |
| @@ -186,6 +186,7 @@ void perf_env__exit(struct perf_env *env) |
| zfree(&env->cpuid); |
| zfree(&env->cmdline); |
| zfree(&env->cmdline_argv); |
| + zfree(&env->sibling_dies); |
| zfree(&env->sibling_cores); |
| zfree(&env->sibling_threads); |
| zfree(&env->pmu_mappings); |
| -- |
| 2.30.2 |
| |