Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

perf report: Fix leak of resolved callchains array on error path

Browse source 
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2010-05-09 12:01:05 -03:00
parent 139633c6a4
commit 39d1e1b1e2
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/perf/builtin-report.c
View file

@ -83,7 +83,7 @@ static int perf_session__add_hist_entry(struct perf_session *self,
struct map_symbol *syms = NULL; struct map_symbol *syms = NULL;
struct symbol *parent = NULL; struct symbol *parent = NULL;
bool hit; bool hit;
int err; int err = -ENOMEM;
struct hist_entry *he; struct hist_entry *he;
struct event_stat_id *stats; struct event_stat_id *stats;
struct perf_event_attr *attr; struct perf_event_attr *attr;
@ -101,26 +101,24 @@ static int perf_session__add_hist_entry(struct perf_session *self,
else else
stats = get_stats(self, data->id, 0, 0); stats = get_stats(self, data->id, 0, 0);
if (stats == NULL) if (stats == NULL)
return -ENOMEM; goto out_free_syms;
he = __perf_session__add_hist_entry(&stats->hists, al, parent, he = __perf_session__add_hist_entry(&stats->hists, al, parent,
data->period, &hit); data->period, &hit);
if (he == NULL) if (he == NULL)
return -ENOMEM; goto out_free_syms;
if (hit) if (hit)
__perf_session__add_count(he, al, data->period); __perf_session__add_count(he, al, data->period);
err = 0;
if (symbol_conf.use_callchain) { if (symbol_conf.use_callchain) {
if (!hit) if (!hit)
callchain_init(he->callchain); callchain_init(he->callchain);
err = append_chain(he->callchain, data->callchain, syms); err = append_chain(he->callchain, data->callchain, syms);
free(syms);
if (err)
return err;
} }
out_free_syms:
return 0; free(syms);
return err;
} }
static int add_event_total(struct perf_session *session, static int add_event_total(struct perf_session *session,