summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Palka <patrick@parcs.ath.cx>2014-03-12 18:40:51 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2014-03-14 13:45:54 -0300
commit6eeefccdcfc2cc9697562e740bfe6c35fddd4e1c (patch)
tree8485c870071abd4d7600a5441ed3539beeebd9ec
parent0fae799e869b9b1ece8c04c714d0529da0b0bade (diff)
downloadblackbird-op-linux-6eeefccdcfc2cc9697562e740bfe6c35fddd4e1c.tar.gz
blackbird-op-linux-6eeefccdcfc2cc9697562e740bfe6c35fddd4e1c.zip
perf bench: Fix NULL pointer dereference in "perf bench all"
The for_each_bench() macro 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 this NULL pointer dereference when running "perf bench all": [root@ssdandy ~]# perf bench all <SNIP> # Running mem/memset benchmark... # Copying 1MB Bytes ... 2.453675 GB/Sec 12.056327 GB/Sec (with prefault) Segmentation fault (core dumped) [root@ssdandy ~]# Signed-off-by: Patrick Palka <patrick@parcs.ath.cx> Cc: Ingo Molnar <mingo@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1394664051-6037-1-git-send-email-patrick@parcs.ath.cx Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/builtin-bench.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-bench.c b/tools/perf/builtin-bench.c
index e47f90cc7b98..8a987d252780 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)
{
OpenPOWER on IntegriCloud