diff options
| author | Wang Nan <wangnan0@huawei.com> | 2015-08-25 09:27:35 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-08-26 09:34:11 -0400 |
| commit | e486367f0101d43a044404ed2fa35aa043b19667 (patch) | |
| tree | a60c856163672a05c7d693e1e3a2bedc3ae723c0 /tools/perf | |
| parent | 9d1bf02ac3d41367896b38793db6f8f30bb9a295 (diff) | |
perf probe: Prevent segfault when reading probe point with absolute address
'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>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/probe-event.c | 8 |
1 files 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, | |||
| 515 | if (ret < 0) | 515 | if (ret < 0) |
| 516 | goto error; | 516 | goto error; |
| 517 | addr += stext; | 517 | addr += stext; |
| 518 | } else { | 518 | } else if (tp->symbol) { |
| 519 | addr = kernel_get_symbol_address_by_name(tp->symbol, false); | 519 | addr = kernel_get_symbol_address_by_name(tp->symbol, false); |
| 520 | if (addr == 0) | 520 | if (addr == 0) |
| 521 | goto error; | 521 | goto error; |
| @@ -1815,17 +1815,17 @@ static int find_perf_probe_point_from_map(struct probe_trace_point *tp, | |||
| 1815 | { | 1815 | { |
| 1816 | struct symbol *sym = NULL; | 1816 | struct symbol *sym = NULL; |
| 1817 | struct map *map; | 1817 | struct map *map; |
| 1818 | u64 addr; | 1818 | u64 addr = tp->address; |
| 1819 | int ret = -ENOENT; | 1819 | int ret = -ENOENT; |
| 1820 | 1820 | ||
| 1821 | if (!is_kprobe) { | 1821 | if (!is_kprobe) { |
| 1822 | map = dso__new_map(tp->module); | 1822 | map = dso__new_map(tp->module); |
| 1823 | if (!map) | 1823 | if (!map) |
| 1824 | goto out; | 1824 | goto out; |
| 1825 | addr = tp->address; | ||
| 1826 | sym = map__find_symbol(map, addr, NULL); | 1825 | sym = map__find_symbol(map, addr, NULL); |
| 1827 | } else { | 1826 | } else { |
| 1828 | addr = kernel_get_symbol_address_by_name(tp->symbol, true); | 1827 | if (tp->symbol) |
| 1828 | addr = kernel_get_symbol_address_by_name(tp->symbol, true); | ||
| 1829 | if (addr) { | 1829 | if (addr) { |
| 1830 | addr += tp->offset; | 1830 | addr += tp->offset; |
| 1831 | sym = __find_kernel_function(addr, &map); | 1831 | sym = __find_kernel_function(addr, &map); |
