[BUGFIX PATCH V2 1/3] kprobes/arm: Allow to handle reentered kprobe on single-stepping

Path	csiph.com!1.us.feeder.erje.net!2.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!news.unit0.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Masami Hiramatsu <mhiramat@kernel.org>
Newsgroups	linux.kernel
Subject	[BUGFIX PATCH V2 1/3] kprobes/arm: Allow to handle reentered kprobe on single-stepping
Date	Wed, 15 Feb 2017 01:30:01 +0100
Message-ID	<taVDP-tw-9@gated-at.bofh.it> (permalink)
References	<taVDP-tw-3@gated-at.bofh.it>
X-Mailer	git-send-email 2.9.3
User-Agent	StGit/0.17.1-dirty
MIME-Version	1.0
Content-Type	text/plain; charset="utf-8"
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	45
Organization	linux.* mail to news gateway
X-Original-Cc	Masami Hiramatsu <mhiramat@kernel.org>, linux-kernel@vger.kernel.org, Peter Zijlstra <peterz@infradead.org>, Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>, Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, "H . Peter Anvin" <hpa@zytor.com>, Jon Medhurst <tixy@linaro.org>, Wang Nan <wangnan0@huawei.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, "David A . Long" <dave.long@linaro.org>, Sandeepa Prabhu <sandeepa.s.prabhu@gmail.com>
X-Original-Date	Wed, 15 Feb 2017 09:28:45 +0900
X-Original-Message-ID	<148711851481.5814.3328157719017495110.stgit@devbox>
X-Original-References	<148711844284.5814.10387227824715177703.stgit@devbox>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1580957

Show key headers only | View raw

This is arm port of commit 6a5022a56ac3 ("kprobes/x86: Allow to
handle reentered kprobe on single-stepping")

Since the FIQ handlers can interrupt in the single stepping
(or preparing the single stepping, do_debug etc.), we should
consider a kprobe is hit in the NMI handler. Even in that
case, the kprobe is allowed to be reentered as same as the
kprobes is hit in kprobe handlers (KPROBE_HIT_ACTIVE or
KPROBE_HIT_SSDONE.)

The real issue will happen when a kprobe hit while another
reentered kprobe is processing (KPROBE_REENTER), because
we already consumed a saved-area for the previous kprobe.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
Reported-by: Russell King <linux@armlinux.org.uk>
---
 arch/arm/probes/kprobes/core.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/probes/kprobes/core.c b/arch/arm/probes/kprobes/core.c
index a4ec240..264fedb 100644
--- a/arch/arm/probes/kprobes/core.c
+++ b/arch/arm/probes/kprobes/core.c
@@ -270,6 +270,7 @@ void __kprobes kprobe_handler(struct pt_regs *regs)
 			switch (kcb->kprobe_status) {
 			case KPROBE_HIT_ACTIVE:
 			case KPROBE_HIT_SSDONE:
+			case KPROBE_HIT_SS:
 				/* A pre- or post-handler probe got us here. */
 				kprobes_inc_nmissed_count(p);
 				save_previous_kprobe(kcb);
@@ -278,6 +279,11 @@ void __kprobes kprobe_handler(struct pt_regs *regs)
 				singlestep(p, regs, kcb);
 				restore_previous_kprobe(kcb);
 				break;
+			case KPROBE_REENTER:
+				/* A nested probe was hit in FIQ, it is a BUG */
+				pr_warn("Unrecoverable kprobe detected at %p.\n",
+					p->addr);
+				/* fall through */
 			default:
 				/* impossible cases */
 				BUG();

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[BUGFIX PATCH V2 1/3] kprobes/arm: Allow to handle reentered kprobe on single-stepping Masami Hiramatsu <mhiramat@kernel.org> - 2017-02-15 01:30 +0100

csiph-web