[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-1c1bc9223387dacc48eb2b61b0baabe7e9cf47f6@git.kernel.org>
Date: Fri, 2 Mar 2012 01:52:15 -0800
From: tip-bot for Prashanth Nageshappa <prashanth@...ux.vnet.ibm.com>
To: linux-tip-commits@...r.kernel.org
Cc: acme@...hat.com, linux-kernel@...r.kernel.org, hpa@...or.com,
mingo@...hat.com, prashanth@...ux.vnet.ibm.com, ananth@...ibm.com,
masami.hiramatsu.pt@...achi.com, rostedt@...dmis.org,
akpm@...ux-foundation.org, srikar@...ux.vnet.ibm.com,
tglx@...utronix.de, jbaron@...hat.com
Subject: [tip:perf/urgent] perf probe:
Ensure offset provided is not greater than function length without DWARF info too
Commit-ID: 1c1bc9223387dacc48eb2b61b0baabe7e9cf47f6
Gitweb: http://git.kernel.org/tip/1c1bc9223387dacc48eb2b61b0baabe7e9cf47f6
Author: Prashanth Nageshappa <prashanth@...ux.vnet.ibm.com>
AuthorDate: Tue, 28 Feb 2012 09:43:01 +0530
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Wed, 29 Feb 2012 18:29:46 -0300
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@...achi.com>
Cc: Ananth N Mavinakayanahalli <ananth@...ibm.com>
Cc: Jason Baron <jbaron@...hat.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
Cc: Srikar Dronamraju <srikar@...ux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@...dmis.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Link: http://lkml.kernel.org/r/4F4C544D.1010909@linux.vnet.ibm.com
Signed-off-by: Prashanth Nageshappa <prashanth@...ux.vnet.ibm.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
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 29cb654..e33554a 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,
tev->point.symbol);
ret = -ENOENT;
goto error;
+ } else if (tev->point.offset > sym->end - sym->start) {
+ pr_warning("Offset specified is greater than size of %s\n",
+ tev->point.symbol);
+ ret = -ENOENT;
+ goto error;
+
}
return 1;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists