1 files changed, 12 insertions, 0 deletions

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 65bb762b2d80..5595fdd75e82 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -19,6 +19,7 @@
 #include <linux/kallsyms.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/kprobes.h>
 
 #include <asm/atomic.h>
 #include <asm/cacheflush.h>
@@ -313,6 +314,17 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)
                 get_user(instr, (u32 __user *)pc);
         }
 
+#ifdef CONFIG_KPROBES
+        /*
+         * It is possible to have recursive kprobes, so we can't call
+         * the kprobe trap handler with the undef_lock held.
+         */
+        if (instr == KPROBE_BREAKPOINT_INSTRUCTION && !user_mode(regs)) {
+                kprobe_trap_handler(regs, instr);
+                return;
+        }
+#endif
+
         spin_lock_irqsave(&undef_lock, flags);
         list_for_each_entry(hook, &undef_hook, node) {
                 if ((instr & hook->instr_mask) == hook->instr_val &&