Commit b033ab11 authored Sep 15, 2020 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Sep 15, 2020

perf metric: Fix some memory leaks - part 2



The metric_event_delete() missed to free expr->metric_events and it
should free an expr when metric_refs allocation failed.

Fixes: 4ea28967 ("perf metric: Collect referenced metrics in struct metric_expr")
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: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.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-3-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 4f57a1ed

tools/perf/util/metricgroup.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ static void metric_event_delete(struct rblist *rblist __maybe_unused,

		list_for_each_entry_safe(expr, tmp, &me->head, nd) {
		free(expr->metric_refs);
		free(expr->metric_events);
		free(expr);
		}

		@@ -316,6 +317,7 @@ static int metricgroup__setup_events(struct list_head *groups,
		if (!metric_refs) {
		ret = -ENOMEM;
		free(metric_events);
		free(expr);
		break;
		}