Skip to content

Commit b033ab1

Browse files
namhyungacmel
authored andcommittedSep 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: 4ea2896 ("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>
1 parent 4f57a1e commit b033ab1

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed
 

‎tools/perf/util/metricgroup.c

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ static void metric_event_delete(struct rblist *rblist __maybe_unused,
8585

8686
list_for_each_entry_safe(expr, tmp, &me->head, nd) {
8787
free(expr->metric_refs);
88+
free(expr->metric_events);
8889
free(expr);
8990
}
9091

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

0 commit comments

Comments
 (0)