From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756311Ab2CBJxF (ORCPT ); Fri, 2 Mar 2012 04:53:05 -0500 Received: from terminus.zytor.com ([198.137.202.10]:44114 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755830Ab2CBJxC (ORCPT ); Fri, 2 Mar 2012 04:53:02 -0500 Date: Fri, 2 Mar 2012 01:52:15 -0800 From: tip-bot for Prashanth Nageshappa Message-ID: Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, prashanth@linux.vnet.ibm.com, ananth@in.ibm.com, masami.hiramatsu.pt@hitachi.com, rostedt@goodmis.org, akpm@linux-foundation.org, srikar@linux.vnet.ibm.com, tglx@linutronix.de, jbaron@redhat.com Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, prashanth@linux.vnet.ibm.com, ananth@in.ibm.com, masami.hiramatsu.pt@hitachi.com, rostedt@goodmis.org, akpm@linux-foundation.org, srikar@linux.vnet.ibm.com, jbaron@redhat.com, tglx@linutronix.de In-Reply-To: <4F4C544D.1010909@linux.vnet.ibm.com> References: <4F4C544D.1010909@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf probe: Ensure offset provided is not greater than function length without DWARF info too Git-Commit-ID: 1c1bc9223387dacc48eb2b61b0baabe7e9cf47f6 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (terminus.zytor.com [127.0.0.1]); Fri, 02 Mar 2012 01:52:42 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1c1bc9223387dacc48eb2b61b0baabe7e9cf47f6 Gitweb: http://git.kernel.org/tip/1c1bc9223387dacc48eb2b61b0baabe7e9cf47f6 Author: Prashanth Nageshappa AuthorDate: Tue, 28 Feb 2012 09:43:01 +0530 Committer: Arnaldo Carvalho de Melo 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 Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Masami Hiramatsu Cc: Srikar Dronamraju Cc: Steven Rostedt Cc: Andrew Morton Link: http://lkml.kernel.org/r/4F4C544D.1010909@linux.vnet.ibm.com Signed-off-by: Prashanth Nageshappa Signed-off-by: Arnaldo Carvalho de Melo --- 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;