Commit-ID: cb6186aeffda4d27e56066c79e9579e7831541d3
Gitweb: https://git.kernel.org/tip/cb6186aeffda4d27e56066c79e9579e7831541d3
Author: Changbin Du <changbin...@gmail.com>
AuthorDate: Sat, 16 Mar 2019 16:05:49 +0800
Committer: Arnaldo Carvalho de Melo <a...@redhat.com>
CommitDate: Tue, 19 Mar 2019 16:52:04 -0300
perf hist: Add missing map__put() in error case
We need to map__put() before returning from failure of
sample__resolve_callchain().
Detected with gcc's ASan.
Signed-off-by: Changbin Du <changbin...@gmail.com>
Reviewed-by: Jiri Olsa <jo...@kernel.org>
Cc: Alexei Starovoitov <a...@kernel.org>
Cc: Daniel Borkmann <dan...@iogearbox.net>
Cc: Krister Johansen <k...@templeofstupid.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Steven Rostedt (VMware) <rost...@goodmis.org>
Fixes: 9c68ae98c6f7 ("perf callchain: Reference count maps")
Link: http://lkml.kernel.org/r/20190316080556.3075-10-changbin...@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
tools/perf/util/hist.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 1f230285d78a..7ace7a10054d 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -1111,8 +1111,10 @@ int hist_entry_iter__add(struct hist_entry_iter *iter,
struct addr_location *al,
err = sample__resolve_callchain(iter->sample, &callchain_cursor,
&iter->parent,
iter->evsel, al, max_stack_depth);
- if (err)
+ if (err) {
+ map__put(alm);
return err;
+ }
err = iter->ops->prepare_entry(iter, al);
if (err)
