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

Groups > linux.kernel > #1213999

[PATCH 15/22] perf probe: Prevent segfault when reading probe point with absolute address

Show all headers | View raw

From: Wang Nan <wangnan0@huawei.com>

'perf probe -l' panic if there is a manually inserted probing point with
absolute address. For example:

  # echo 'p:probe/abs_ffffffff811e6615 0xffffffff811e6615' > /sys/kernel/debug/tracing/kprobe_events
  # perf probe -l
  Segmentation fault (core dumped)

This patch fix this problem by considering the situation that
"tp->symbol == NULL" in find_perf_probe_point_from_dwarf() and
find_perf_probe_point_from_map().

After this patch:

  # perf probe -l
  probe:abs_ffffffff811e6615 (on SyS_write+5@fs/read_write.c)

And when debug info is missing:

  # rm -rf ~/.debug
  # mv /lib/modules/4.2.0-rc1+/build/vmlinux /lib/modules/4.2.0-rc1+/build/vmlinux.bak
  # perf probe -l
  probe:abs_ffffffff811e6615 (on sys_write+5)

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1440509256-193590-1-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/probe-event.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index f07374bc9c5a..6c7e538c9b8b 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -515,7 +515,7 @@ static int find_perf_probe_point_from_dwarf(struct probe_trace_point *tp,
 		if (ret < 0)
 			goto error;
 		addr += stext;
-	} else {
+	} else if (tp->symbol) {
 		addr = kernel_get_symbol_address_by_name(tp->symbol, false);
 		if (addr == 0)
 			goto error;
@@ -1815,17 +1815,17 @@ static int find_perf_probe_point_from_map(struct probe_trace_point *tp,
 {
 	struct symbol *sym = NULL;
 	struct map *map;
-	u64 addr;
+	u64 addr = tp->address;
 	int ret = -ENOENT;
 
 	if (!is_kprobe) {
 		map = dso__new_map(tp->module);
 		if (!map)
 			goto out;
-		addr = tp->address;
 		sym = map__find_symbol(map, addr, NULL);
 	} else {
-		addr = kernel_get_symbol_address_by_name(tp->symbol, true);
+		if (tp->symbol)
+			addr = kernel_get_symbol_address_by_name(tp->symbol, true);
 		if (addr) {
 			addr += tp->offset;
 			sym = __find_kernel_function(addr, &map);
-- 
2.1.0

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

[GIT PULL 00/22] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:00 +0200
  [PATCH 14/22] perf tools: Update Intel PT documentation Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:00 +0200
  [PATCH 09/22] perf tools: Add Intel PT support for decoding MTC packets Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:00 +0200
  [PATCH 21/22] perf probe: Support probing at absolute address Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:00 +0200
  [PATCH 03/22] perf ui tui progress: Implement the ui_progress_ops->finish() method Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:00 +0200
  [PATCH 01/22] perf tools: Fix tarball build broken by pt/bts Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:00 +0200
  [PATCH 05/22] perf tools: Fix Intel PT 'instructions' sample period Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 16/22] perf tools: Remove export.h from MANIFEST Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 11/22] perf tools: Add Intel PT support for decoding CYC packets Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 04/22] perf ordered_events: Clear the progress bar at the end of a flush Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 08/22] perf tools: Pass Intel PT information for decoding MTC and CYC Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 06/22] perf tools: Add Intel PT support for PSB periods Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 19/22] perf probe: Fix list result when address is zero Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 18/22] perf probe: Fix list result when symbol can't be found Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 07/22] perf tools: Add new Intel PT packet definitions Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 15/22] perf probe: Prevent segfault when reading probe point with absolute address Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 12/22] perf tools: Add Intel PT support for using CYC packets Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 20/22] perf probe: Fix error reported when offset without function Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 22/22] tracing/uprobes: Do not print '0x (null)' when offset is 0 Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 10/22] perf tools: Add Intel PT support for using MTC packets Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 17/22] tools build: Allow duplicate objects in the object list Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  [PATCH 13/22] perf tools: Add Intel PT support for decoding TRACESTOP packets Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-08-26 18:10 +0200
  Re: [GIT PULL 00/22] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2015-08-28 08:30 +0200

csiph-web