lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 22 Mar 2019 15:29:58 -0700 From: tip-bot for Changbin Du <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: namhyung@...nel.org, linux-kernel@...r.kernel.org, mingo@...nel.org, jolsa@...nel.org, changbin.du@...il.com, peterz@...radead.org, rostedt@...dmis.org, daniel@...earbox.net, ast@...nel.org, kjlx@...pleofstupid.com, hpa@...or.com, tglx@...utronix.de, acme@...hat.com Subject: [tip:perf/urgent] perf hist: Add missing map__put() in error case Commit-ID: cb6186aeffda4d27e56066c79e9579e7831541d3 Gitweb: https://git.kernel.org/tip/cb6186aeffda4d27e56066c79e9579e7831541d3 Author: Changbin Du <changbin.du@...il.com> AuthorDate: Sat, 16 Mar 2019 16:05:49 +0800 Committer: Arnaldo Carvalho de Melo <acme@...hat.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.du@...il.com> Reviewed-by: Jiri Olsa <jolsa@...nel.org> Cc: Alexei Starovoitov <ast@...nel.org> Cc: Daniel Borkmann <daniel@...earbox.net> Cc: Krister Johansen <kjlx@...pleofstupid.com> Cc: Namhyung Kim <namhyung@...nel.org> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Steven Rostedt (VMware) <rostedt@...dmis.org> Fixes: 9c68ae98c6f7 ("perf callchain: Reference count maps") Link: http://lkml.kernel.org/r/20190316080556.3075-10-changbin.du@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.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)
Powered by blists - more mailing lists