From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Jiri Olsa <jolsa@kernel.org>, Andi Kleen <andi@firstfloor.org>,
Changbin Du <changbin.du@intel.com>,
David Ahern <dsahern@gmail.com>,
Jin Yao <yao.jin@linux.intel.com>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Wang Nan <wangnan0@huawei.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 2/8] perf hists: Add extra integrity checks to fmt_free()
Date: Thu, 19 Oct 2017 14:45:09 -0300 [thread overview]
Message-ID: <20171019174515.7407-3-acme@kernel.org> (raw)
In-Reply-To: <20171019174515.7407-1-acme@kernel.org>
From: Jiri Olsa <jolsa@kernel.org>
Make sure the struct perf_hpp_fmt is properly unhooked before we free
it.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Changbin Du <changbin.du@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20171013083736.15037-3-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.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 6ee6b36bbc76..db79017a6e56 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -606,6 +606,13 @@ void perf_hpp__append_sort_keys(struct perf_hpp_list *list)
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);
}
--
2.13.6
next prev parent reply other threads:[~2017-10-19 17:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 17:45 [GIT PULL 0/8] perf/urgent fixes Arnaldo Carvalho de Melo
2017-10-19 17:45 ` [PATCH 1/8] perf hists: Fix crash in perf_hpp__reset_output_field() Arnaldo Carvalho de Melo
2017-10-19 17:45 ` Arnaldo Carvalho de Melo [this message]
2017-10-19 17:45 ` [PATCH 3/8] perf tools: Check wether the eBPF file exists in event parsing Arnaldo Carvalho de Melo
2017-10-19 17:45 ` [PATCH 4/8] perf tools: Add long time reviewers to MAINTAINERS Arnaldo Carvalho de Melo
2017-10-19 17:45 ` [PATCH 5/8] perf record: Fix documentation for a inexistent option '-l' Arnaldo Carvalho de Melo
2017-10-19 17:45 ` [PATCH 6/8] perf buildid-list: Fix crash when processing PERF_RECORD_NAMESPACE Arnaldo Carvalho de Melo
2017-10-19 17:45 ` [PATCH 7/8] perf xyarray: Fix wrong processing when closing evsel fd Arnaldo Carvalho de Melo
2017-10-19 17:45 ` [PATCH 8/8] perf test shell trace+probe_libc_inet_pton.sh: Be compatible with Debian/Ubuntu Arnaldo Carvalho de Melo
2017-10-20 7:16 ` [GIT PULL 0/8] perf/urgent fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171019174515.7407-3-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=andi@firstfloor.org \
--cc=changbin.du@intel.com \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=wangnan0@huawei.com \
--cc=yao.jin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).