[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-d0d3913895e5b50623bd4dafd876e41c1169031d@git.kernel.org>
Date: Tue, 21 Aug 2012 09:12:36 -0700
From: tip-bot for Namhyung Kim <namhyung.kim@....com>
To: linux-tip-commits@...r.kernel.org
Cc: acme@...hat.com, linux-kernel@...r.kernel.org, paulus@...ba.org,
hpa@...or.com, mingo@...nel.org, a.p.zijlstra@...llo.nl,
namhyung.kim@....com, namhyung@...nel.org, tglx@...utronix.de,
feng.tang@...el.com
Subject: [tip:perf/core] perf script: Fix a NULL pointer dereference
Commit-ID: d0d3913895e5b50623bd4dafd876e41c1169031d
Gitweb: http://git.kernel.org/tip/d0d3913895e5b50623bd4dafd876e41c1169031d
Author: Namhyung Kim <namhyung.kim@....com>
AuthorDate: Tue, 14 Aug 2012 10:57:03 +0900
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 14 Aug 2012 10:36:30 -0300
perf script: Fix a NULL pointer dereference
If 'perf script --gen-script' was called with a perf.data which contains
no tracepoint event, it'd segfault due to NULL pevent pointer. Fix it.
Signed-off-by: Namhyung Kim <namhyung@...nel.org>
Cc: Feng Tang <feng.tang@...el.com>
Cc: Ingo Molnar <mingo@...nel.org>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Link: http://lkml.kernel.org/r/1344909423-26384-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/util/trace-event-parse.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 4cb7f38..a5a554e 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -293,7 +293,7 @@ struct event_format *trace_find_next_event(struct pevent *pevent,
{
static int idx;
- if (!pevent->events)
+ if (!pevent || !pevent->events)
return NULL;
if (!event) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists