From: tip-bot for David Ahern <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
mingo@kernel.org, jolsa@redhat.com, dsahern@gmail.com,
adrian.hunter@intel.com, tglx@linutronix.de
Subject: [tip:perf/urgent] perf record: Fix segfault with --no-mmap-pages
Date: Tue, 12 Nov 2013 13:57:06 -0800 [thread overview]
Message-ID: <tip-8973504be70b2986a2081eeff7d9a4210dec295d@git.kernel.org> (raw)
In-Reply-To: <1384267617-3446-2-git-send-email-dsahern@gmail.com>
Commit-ID: 8973504be70b2986a2081eeff7d9a4210dec295d
Gitweb: http://git.kernel.org/tip/8973504be70b2986a2081eeff7d9a4210dec295d
Author: David Ahern <dsahern@gmail.com>
AuthorDate: Tue, 12 Nov 2013 07:46:53 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 12 Nov 2013 16:30:54 -0300
perf record: Fix segfault with --no-mmap-pages
Adrian reported a segfault when using --no-out-pages:
$ tools/perf/perf record -vv --no-out-pages uname
Segmentation fault (core dumped)
The same occurs with --no-mmap-pages. Fix by checking that str is
non-NULL before parsing it.
Signed-off-by: David Ahern <dsahern@gmail.com>
Reported-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1384267617-3446-2-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/evlist.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 99dc58e..3960560 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -719,6 +719,9 @@ int perf_evlist__parse_mmap_pages(const struct option *opt, const char *str,
{ .tag = 0 },
};
+ if (str == NULL)
+ return -1;
+
val = parse_tag_value(str, tags);
if (val != (unsigned long) -1) {
/* we got file size value */
next prev parent reply other threads:[~2013-11-12 22:00 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-12 14:46 [PATCH 0/5] perf record: mmap output file - v5 David Ahern
2013-11-12 14:46 ` [PATCH 1/5] perf record: Fix segfault with --no-mmap-pages David Ahern
2013-11-12 21:57 ` tip-bot for David Ahern [this message]
2013-11-12 14:46 ` [PATCH 2/5] perf tool: Round mmap pages to power 2 - v2 David Ahern
2013-11-12 21:57 ` [tip:perf/urgent] perf evlist: " tip-bot for David Ahern
2013-11-12 14:46 ` [PATCH 3/5] perf tool: Refactor mmap_pages parsing David Ahern
2013-11-12 21:57 ` [tip:perf/urgent] perf evlist: " tip-bot for David Ahern
2013-11-12 14:46 ` [PATCH 4/5] perf record: mmap output file - v5 David Ahern
2013-11-12 14:57 ` Peter Zijlstra
2013-11-12 15:07 ` Arnaldo Carvalho de Melo
2013-11-12 15:19 ` Peter Zijlstra
2013-11-12 15:36 ` David Ahern
2013-11-12 21:11 ` Ingo Molnar
2013-11-13 11:34 ` Peter Zijlstra
2013-11-13 11:50 ` Ingo Molnar
2013-11-13 12:16 ` Peter Zijlstra
2013-11-13 14:29 ` David Ahern
2013-11-15 16:41 ` David Ahern
2013-11-18 9:01 ` Peter Zijlstra
2013-11-18 9:40 ` Ingo Molnar
2013-11-19 0:24 ` Namhyung Kim
2013-11-19 0:34 ` David Ahern
2013-11-19 1:48 ` Namhyung Kim
2013-11-19 2:02 ` Namhyung Kim
2013-11-19 2:13 ` Namhyung Kim
2013-11-19 2:17 ` David Ahern
2013-11-19 2:30 ` Namhyung Kim
2013-11-19 2:33 ` David Ahern
2013-11-19 2:36 ` Namhyung Kim
2013-11-19 6:58 ` Ingo Molnar
2013-11-19 11:48 ` Peter Zijlstra
2013-11-19 11:49 ` Peter Zijlstra
2013-11-19 13:13 ` Ingo Molnar
2013-11-19 13:45 ` Peter Zijlstra
2013-11-19 15:31 ` Ingo Molnar
2013-11-19 16:09 ` David Ahern
2013-11-19 16:14 ` Ingo Molnar
2013-11-19 12:08 ` Peter Zijlstra
2013-11-19 6:54 ` Ingo Molnar
2013-11-12 14:46 ` [PATCH 5/5] perf record: Handle out of space failures writing data with mmap David Ahern
2013-11-12 21:19 ` Ingo Molnar
2013-11-13 14:33 ` David Ahern
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=tip-8973504be70b2986a2081eeff7d9a4210dec295d@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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).