uprobe is registered at break_hook with a unique ESR code. So, when a TRAP_BRKPT occurs, call_break_hook checks if it was for uprobe. If not, then send a SIGTRAP to user.
Signed-off-by: Pratyush Anand <[email protected]> --- arch/arm64/kernel/debug-monitors.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c index 2676b8655241..98ba5c8c5141 100644 --- a/arch/arm64/kernel/debug-monitors.c +++ b/arch/arm64/kernel/debug-monitors.c @@ -306,6 +306,9 @@ static int brk_handler(unsigned long addr, unsigned int esr, { siginfo_t info; + if (call_break_hook(regs, esr) == DBG_HOOK_HANDLED) + return 0; + if (user_mode(regs)) { info = (siginfo_t) { .si_signo = SIGTRAP, @@ -315,12 +318,11 @@ static int brk_handler(unsigned long addr, unsigned int esr, }; force_sig_info(SIGTRAP, &info, current); - } else if (call_break_hook(regs, esr) != DBG_HOOK_HANDLED) { + return 0; + } else { pr_warning("Unexpected kernel BRK exception at EL1\n"); return -EFAULT; } - - return 0; } int aarch32_break_handler(struct pt_regs *regs) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
