[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-d0e35234f647631ddfa5fa8c8ec66c9bc698f0ab@git.kernel.org>
Date: Fri, 20 Oct 2017 00:19:05 -0700
From: tip-bot for Jiri Olsa <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: peterz@...radead.org, hpa@...or.com, dsahern@...il.com,
andi@...stfloor.org, jolsa@...nel.org, mingo@...nel.org,
changbin.du@...el.com, linux-kernel@...r.kernel.org,
namhyung@...nel.org, acme@...hat.com, yao.jin@...ux.intel.com,
wangnan0@...wei.com, tglx@...utronix.de
Subject: [tip:perf/urgent] perf hists: Add extra integrity checks to
fmt_free()
Commit-ID: d0e35234f647631ddfa5fa8c8ec66c9bc698f0ab
Gitweb: https://git.kernel.org/tip/d0e35234f647631ddfa5fa8c8ec66c9bc698f0ab
Author: Jiri Olsa <jolsa@...nel.org>
AuthorDate: Fri, 13 Oct 2017 10:37:29 +0200
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Fri, 13 Oct 2017 16:43:42 -0300
perf hists: Add extra integrity checks to fmt_free()
Make sure the struct perf_hpp_fmt is properly unhooked before we free
it.
Signed-off-by: Jiri Olsa <jolsa@...nel.org>
Cc: Andi Kleen <andi@...stfloor.org>
Cc: Changbin Du <changbin.du@...el.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Jin Yao <yao.jin@...ux.intel.com>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Wang Nan <wangnan0@...wei.com>
Link: http://lkml.kernel.org/r/20171013083736.15037-3-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/ui/hist.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 6ee6b36..db79017 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -606,6 +606,13 @@ next:
static void fmt_free(struct perf_hpp_fmt *fmt)
{
+ /*
+ * At this point fmt should be completely
+ * unhooked, if not it's a bug.
+ */
+ BUG_ON(!list_empty(&fmt->list));
+ BUG_ON(!list_empty(&fmt->sort_list));
+
if (fmt->free)
fmt->free(fmt);
}
Powered by blists - more mailing lists