From: Patrick Palka <patrick@parcs.ath.cx>
To: linux-kernel@vger.kernel.org
Cc: acme@ghostprotocols.net, mingo@redhat.com, paulus@samba.org,
a.p.zijlstra@chello.nl, Patrick Palka <patrick@parcs.ath.cx>
Subject: [PATCH] perf bench: Fix NULL pointer dereference in "perf bench all"
Date: Wed, 12 Mar 2014 18:40:51 -0400 [thread overview]
Message-ID: <1394664051-6037-1-git-send-email-patrick@parcs.ath.cx> (raw)
for_each_bench() must check that the "benchmarks" field of a collection
is not NULL before dereferencing it because the "all" collection in
particular has a NULL "benchmarks" field (signifying that it has no
benchmarks to iterate over).
This fixes a NULL pointer dereference when running "perf bench all".
Signed-off-by: Patrick Palka <patrick@parcs.ath.cx>
---
tools/perf/builtin-bench.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/builtin-bench.c b/tools/perf/builtin-bench.c
index e47f90c..8a987d2 100644
--- a/tools/perf/builtin-bench.c
+++ b/tools/perf/builtin-bench.c
@@ -76,7 +76,7 @@ static struct collection collections[] = {
/* Iterate over all benchmarks within a collection: */
#define for_each_bench(coll, bench) \
- for (bench = coll->benchmarks; bench->name; bench++)
+ for (bench = coll->benchmarks; bench && bench->name; bench++)
static void dump_benchmarks(struct collection *coll)
{
--
1.9.0
next reply other threads:[~2014-03-12 22:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 22:40 Patrick Palka [this message]
2014-03-13 14:34 ` Arnaldo Carvalho de Melo
2014-03-13 14:47 ` Patrick Palka
2014-03-13 18:18 ` Arnaldo Carvalho de Melo
2014-03-18 8:29 ` [tip:perf/urgent] perf bench: Fix NULL pointer dereference in " perf " tip-bot for Patrick Palka
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=1394664051-6037-1-git-send-email-patrick@parcs.ath.cx \
--to=patrick@parcs.ath.cx \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paulus@samba.org \
/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
all inboxes | Powered by JetHome®