From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>,
linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Wang Nan <wangnan0@huawei.com>
Subject: [PATCH perf/core 4/5] [BUGFIX] perf-probe: Fix a segfault bug in debuginfo_cache
Date: Thu, 01 Oct 2015 01:41:35 +0900 [thread overview]
Message-ID: <20150930164135.3733.23993.stgit@localhost.localdomain> (raw)
In-Reply-To: <20150930164126.3733.47708.stgit@localhost.localdomain>
perf probe --list will get a segfault if the first kprobe
event is on a module and the second or latter one on
the kernel.
e.g.
----
# ./perf probe -q -m pcspkr pcspkr_event
# ./perf probe -q vfs_read
# ./perf probe -l
Segmentation fault (core dumped)
----
This is because the debuginfo_cache fails to handle NULL
module name, which causes segfault on strcmp. (Note that
strcmp("something", NULL) always causes segfault)
To fix this debuginfo_cache__open always translates the
NULL module name to "kernel" (this is correct, because
NULL module name means opening the debuginfo for the kernel)
----
# ./perf probe -l
probe:pcspkr_event (on pcspkr_event@drivers/input/misc/pcspkr.c
in pcspkr)
probe:vfs_read (on vfs_read@ksrc/linux-3/fs/read_write.c)
----
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
tools/perf/util/probe-event.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 57a8cad..bb7766ea 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -440,19 +440,22 @@ static char *debuginfo_cache_path;
static struct debuginfo *debuginfo_cache__open(const char *module, bool silent)
{
- if ((debuginfo_cache_path && !strcmp(debuginfo_cache_path, module)) ||
- (!debuginfo_cache_path && !module && debuginfo_cache))
+ const char *path = module;
+
+ /* If the module is NULL, it should be the kernel. */
+ if (!module)
+ path = "kernel";
+
+ if (debuginfo_cache_path && !strcmp(debuginfo_cache_path, path))
goto out;
/* Copy module path */
free(debuginfo_cache_path);
- if (module) {
- debuginfo_cache_path = strdup(module);
- if (!debuginfo_cache_path) {
- debuginfo__delete(debuginfo_cache);
- debuginfo_cache = NULL;
- goto out;
- }
+ debuginfo_cache_path = strdup(path);
+ if (!debuginfo_cache_path) {
+ debuginfo__delete(debuginfo_cache);
+ debuginfo_cache = NULL;
+ goto out;
}
debuginfo_cache = open_debuginfo(module, silent);
next prev parent reply other threads:[~2015-09-30 16:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-30 16:41 [PATCH perf/core 0/5] perf-probe bugfixes Masami Hiramatsu
2015-09-30 16:41 ` [PATCH perf/core 1/5] [BUGFIX] perf-probe: Begin and end report session correctly Masami Hiramatsu
2015-10-01 7:13 ` [tip:perf/core] perf probe: Begin and end libdwfl " tip-bot for Masami Hiramatsu
2015-09-30 16:41 ` [PATCH perf/core 2/5] [BUGFIX] perf-probe: Fix to remove dot suffix from second or latter events Masami Hiramatsu
2015-10-01 7:12 ` [tip:perf/core] perf probe: " tip-bot for Masami Hiramatsu
2015-09-30 16:41 ` [PATCH perf/core 3/5] [BUGFIX] perf-probe: Show correct source lines of probes on kmodules Masami Hiramatsu
2015-10-01 7:13 ` [tip:perf/core] perf probe: " tip-bot for Masami Hiramatsu
2015-09-30 16:41 ` Masami Hiramatsu [this message]
2015-10-01 7:14 ` [tip:perf/core] perf probe: Fix a segfault bug in debuginfo_cache tip-bot for Masami Hiramatsu
2015-09-30 16:41 ` [PATCH perf/core 5/5] perf-probe: Improve error message when %return is on inlined function Masami Hiramatsu
2015-10-01 7:14 ` [tip:perf/core] perf probe: " tip-bot for Masami Hiramatsu
2015-09-30 20:10 ` [PATCH perf/core 0/5] perf-probe bugfixes Arnaldo Carvalho de Melo
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=20150930164135.3733.23993.stgit@localhost.localdomain \
--to=masami.hiramatsu.pt@hitachi.com \
--cc=acme@kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@kernel.org \
--cc=wangnan0@huawei.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.