diff options
author | Prashanth Nageshappa <prashanth@linux.vnet.ibm.com> | 2012-02-27 23:13:01 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-02-29 16:29:46 -0500 |
commit | 1c1bc9223387dacc48eb2b61b0baabe7e9cf47f6 (patch) | |
tree | 873357b11c3423f2b8798b0c9e8e5ac18735db66 /tools/perf/util/probe-event.c | |
parent | cfbd70c17c4535e64be92ea442a2a45078a18184 (diff) |
perf probe: Ensure offset provided is not greater than function length without DWARF info too
The 'perf probe' command allows kprobe to be inserted at any offset from
a function start, which results in adding kprobes to unintended
location. (example: perf probe do_fork+10000 is allowed even though
size of do_fork is ~904).
My previous patch https://lkml.org/lkml/2012/2/24/42 addressed the case
where DWARF info was available for the kernel. This patch fixes the
case where perf probe is used on a kernel without debuginfo available.
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/4F4C544D.1010909@linux.vnet.ibm.com
Signed-off-by: Prashanth Nageshappa <prashanth@linux.vnet.ibm.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/probe-event.c')
-rw-r--r-- | tools/perf/util/probe-event.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 29cb65459811..e33554a562b3 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c | |||
@@ -1867,6 +1867,12 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev, | |||
1867 | tev->point.symbol); | 1867 | tev->point.symbol); |
1868 | ret = -ENOENT; | 1868 | ret = -ENOENT; |
1869 | goto error; | 1869 | goto error; |
1870 | } else if (tev->point.offset > sym->end - sym->start) { | ||
1871 | pr_warning("Offset specified is greater than size of %s\n", | ||
1872 | tev->point.symbol); | ||
1873 | ret = -ENOENT; | ||
1874 | goto error; | ||
1875 | |||
1870 | } | 1876 | } |
1871 | 1877 | ||
1872 | return 1; | 1878 | return 1; |