Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1236533

[PATCH perf/core 4/5] [BUGFIX] perf-probe: Fix a segfault bug in debuginfo_cache

Show all headers | View raw

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);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH perf/core  0/5] perf-probe bugfixes Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
  [PATCH perf/core 5/5] perf-probe: Improve error message when  %return is on inlined function Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
    [tip:perf/core] perf probe:   Improve error message when %return is on inlined function tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2015-10-01 09:20 +0200
  [PATCH perf/core 3/5] [BUGFIX] perf-probe: Show correct source  lines of probes on kmodules Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
    [tip:perf/core] perf probe:   Show correct source lines of probes on kmodules tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2015-10-01 09:20 +0200
  [PATCH perf/core 4/5] [BUGFIX] perf-probe: Fix a segfault bug in  debuginfo_cache Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
    [tip:perf/core] perf probe: Fix a segfault bug in debuginfo_cache tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2015-10-01 09:20 +0200
  [PATCH perf/core 2/5] [BUGFIX] perf-probe: Fix to remove dot suffix  from second or latter events Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
    [tip:perf/core] perf probe:   Fix to remove dot suffix from second or latter events tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2015-10-01 09:20 +0200
  [PATCH perf/core 1/5] [BUGFIX] perf-probe: Begin and end report  session correctly Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
    [tip:perf/core] perf probe:   Begin and end libdwfl report session correctly tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2015-10-01 09:20 +0200
  Re: [PATCH perf/core  0/5] perf-probe bugfixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-30 22:20 +0200

csiph-web