From 70948c05fdde0aac32f9667856a88725c192fa40 Mon Sep 17 00:00:00 2001

From: Masami Hiramatsu <mhiramat@kernel.org>

Date: Sun, 13 May 2018 05:04:10 +0100

Subject: [PATCH] ARM: 8770/1: kprobes: Prohibit probing on optimized_callback

Git-commit: 70948c05fdde0aac32f9667856a88725c192fa40

Patch-mainline: v4.17-rc6

References: bsc#1051510

Prohibit probing on optimized_callback() because

it is called from kprobes itself. If we put a kprobes

on it, that will cause a recursive call loop.

Mark it NOKPROBE_SYMBOL.

Fixes: 0dc016dbd820 ("ARM: kprobes: enable OPTPROBES for ARM 32")

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>

Cc: stable@vger.kernel.org

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 arch/arm/probes/kprobes/opt-arm.c | 1 +

 1 file changed, 1 insertion(+)

diff --git a/arch/arm/probes/kprobes/opt-arm.c b/arch/arm/probes/kprobes/opt-arm.c

index ddc5a82eb10d..b2aa9b32bff2 100644

--- a/arch/arm/probes/kprobes/opt-arm.c

+++ b/arch/arm/probes/kprobes/opt-arm.c

@@ -192,6 +192,7 @@ optimized_callback(struct optimized_kprobe *op, struct pt_regs *regs)

 	local_irq_restore(flags);

 }

+NOKPROBE_SYMBOL(optimized_callback)

 int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *orig)

 {

-- 

2.18.0