]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
perf evsel: Fix 2 memory leaks
authorIan Rogers <irogers@google.com>
Tue, 12 May 2020 23:59:18 +0000 (16:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Oct 2020 11:18:05 +0000 (13:18 +0200)
[ Upstream commit 3efc899d9afb3d03604f191a0be9669eabbfc4aa ]

If allocated, perf_pkg_mask and metric_events need freeing.

Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.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>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20200512235918.10732-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/perf/util/evsel.c

index 12b1755b136d35aa6c2f637f4c35f306b2a6c1eb..9dd9e3f4ef591b3452d036c8e58e4a778b66105b 100644 (file)
@@ -1255,6 +1255,8 @@ void perf_evsel__exit(struct evsel *evsel)
        zfree(&evsel->group_name);
        zfree(&evsel->name);
        zfree(&evsel->pmu_name);
+       zfree(&evsel->per_pkg_mask);
+       zfree(&evsel->metric_events);
        perf_evsel__object.fini(evsel);
 }