Commit 75feff53 authored Jun 20, 2018 by Masami Hiramatsu Committed by Ingo Molnar Jun 21, 2018

ARM/kprobes: Don't call the ->break_handler() in arm kprobes code



Don't call the ->break_handler() from the arm kprobes code,
because it was only used by jprobes which got removed.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/lkml/152942471328.15209.10625693210204476080.stgit@devbox


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 5ed4b0c5

arch/arm/probes/kprobes/core.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -315,17 +315,6 @@ void __kprobes kprobe_handler(struct pt_regs *regs)
		reset_current_kprobe();
		}
		}
		} else if (cur) {
		/* We probably hit a jprobe. Call its break handler. */
		if (cur->break_handler && cur->break_handler(cur, regs)) {
		kcb->kprobe_status = KPROBE_HIT_SS;
		singlestep(cur, regs, kcb);
		if (cur->post_handler) {
		kcb->kprobe_status = KPROBE_HIT_SSDONE;
		cur->post_handler(cur, regs, 0);
		}
		}
		reset_current_kprobe();
		} else {
		/*
		* The probe was removed and a race is in progress.