Commit f19e80c6 authored by He Kuang's avatar He Kuang Committed by Arnaldo Carvalho de Melo

perf probe: Fix segfault when probe with lazy_line to file

The first argument passed to find_probe_point_lazy() should be CU die,
which will be passed to die_walk_lines() when lazy_line matches.
Currently, when we probe with lazy_line pattern to file without function
name, NULL pointer is passed and causes a segment fault.

Can be reproduced as following:

  $ perf probe -k vmlinux --add='fs/super.c;s->s_count=1;'
  [ 1958.984658] perf[1020]: segfault at 10 ip 00007fc6e10d8c71 sp
  00007ffcbfaaf900 error 4 in libdw-0.161.so[7fc6e10ce000+34000]
  Segmentation fault

After this patch:

  $ perf probe -k vmlinux --add='fs/super.c;s->s_count=1;'
  Added new event:
  probe:_stext         (on @fs/super.c)

  You can now use it in all perf tools, such as:
    perf record -e probe:_stext -aR sleep 1
Signed-off-by: default avatarHe Kuang <hekuang@huawei.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1428925290-5623-3-git-send-email-hekuang@huawei.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 09ed8975
...@@ -1066,7 +1066,7 @@ static int debuginfo__find_probes(struct debuginfo *dbg, ...@@ -1066,7 +1066,7 @@ static int debuginfo__find_probes(struct debuginfo *dbg,
if (pp->function) if (pp->function)
ret = find_probe_point_by_func(pf); ret = find_probe_point_by_func(pf);
else if (pp->lazy_line) else if (pp->lazy_line)
ret = find_probe_point_lazy(NULL, pf); ret = find_probe_point_lazy(&pf->cu_die, pf);
else { else {
pf->lno = pp->line; pf->lno = pp->line;
ret = find_probe_point_by_line(pf); ret = find_probe_point_by_line(pf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment