From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752941AbdGHLOZ (ORCPT ); Sat, 8 Jul 2017 07:14:25 -0400 Received: from terminus.zytor.com ([65.50.211.136]:34547 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752882AbdGHLOX (ORCPT ); Sat, 8 Jul 2017 07:14:23 -0400 Date: Sat, 8 Jul 2017 04:10:52 -0700 From: "tip-bot for Naveen N. Rao" Message-ID: Cc: hpa@zytor.com, ananth@linux.vnet.ibm.com, peterz@infradead.org, naveen.n.rao@linux.vnet.ibm.com, mingo@kernel.org, torvalds@linux-foundation.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: mingo@kernel.org, peterz@infradead.org, naveen.n.rao@linux.vnet.ibm.com, ananth@linux.vnet.ibm.com, hpa@zytor.com, tglx@linutronix.de, mhiramat@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] kprobes: Ensure that jprobe probepoints are at function entry Git-Commit-ID: dbf580623d5fee785218d1a47a2bcdf36d85c0e9 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: dbf580623d5fee785218d1a47a2bcdf36d85c0e9 Gitweb: http://git.kernel.org/tip/dbf580623d5fee785218d1a47a2bcdf36d85c0e9 Author: Naveen N. Rao AuthorDate: Fri, 7 Jul 2017 22:37:26 +0530 Committer: Ingo Molnar CommitDate: Sat, 8 Jul 2017 11:05:35 +0200 kprobes: Ensure that jprobe probepoints are at function entry Similar to commit 90ec5e89e393c ("kretprobes: Ensure probe location is at function entry"), ensure that the jprobe probepoint is at function entry. Signed-off-by: Naveen N. Rao Cc: Ananth N Mavinakayanahalli Cc: Linus Torvalds Cc: Masami Hiramatsu Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/a4525af6c5a42df385efa31251246cf7cca73598.1499443367.git.naveen.n.rao@linux.vnet.ibm.com Signed-off-by: Ingo Molnar --- kernel/kprobes.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index db3cd3e..a1606a4 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1795,10 +1795,14 @@ int register_jprobe(struct jprobe *jp) unsigned long addr, offset; struct kprobe *kp = &jp->kp; - /* Verify probepoint is a function entry point */ + /* + * Verify probepoint as well as the jprobe handler are + * valid function entry points. + */ addr = arch_deref_entry_point(jp->entry); - if (kallsyms_lookup_size_offset(addr, NULL, &offset) && offset == 0) { + if (kallsyms_lookup_size_offset(addr, NULL, &offset) && offset == 0 && + kprobe_on_func_entry(kp->addr, kp->symbol_name, kp->offset)) { kp->pre_handler = setjmp_pre_handler; kp->break_handler = longjmp_break_handler; return register_kprobe(kp);