[tip:perf/urgent] perf session: Fix crash with invalid CPU list

From: tip-bot for David Ahern
Date: Mon Dec 05 2011 - 07:36:23 EST


Commit-ID: 47fbe53bef3b219a365ebf3eca949d6cd4c5291c
Gitweb: http://git.kernel.org/tip/47fbe53bef3b219a365ebf3eca949d6cd4c5291c
Author: David Ahern <dsahern@xxxxxxxxx>
AuthorDate: Sun, 13 Nov 2011 10:45:27 -0700
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Wed, 16 Nov 2011 10:02:26 -0200

perf session: Fix crash with invalid CPU list

commit 5d67be9 added the option to specify a range of CPUs of interest,
but does not catch an invalid CPU list:

$ perf script -c foo
Segmentation fault (core dumped)

Cc: Anton Blanchard <anton@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1321206327-5881-1-git-send-email-dsahern@xxxxxxxxx
Signed-off-by: David Ahern <dsahern@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/session.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 85c1e6b7..0f4555c 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1333,6 +1333,10 @@ int perf_session__cpu_bitmap(struct perf_session *session,
}

map = cpu_map__new(cpu_list);
+ if (map == NULL) {
+ pr_err("Invalid cpu_list\n");
+ return -1;
+ }

for (i = 0; i < map->nr; i++) {
int cpu = map->map[i];
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/