From 271fe8b11ad3cbbc2dccf4ba42178a8b00197fe3 Mon Sep 17 00:00:00 2001 From: Steve Capper Date: Mon, 26 Jan 2015 15:10:33 +0000 Subject: Fixup for uprobes Waiting for this patch series to come out on lakml before commenting on this. Signed-off-by: Steve Capper --- arch/arm64/kernel/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/uprobes.c b/arch/arm64/kernel/uprobes.c index 97e9d17d22b..7c6f23e0201 100644 --- a/arch/arm64/kernel/uprobes.c +++ b/arch/arm64/kernel/uprobes.c @@ -177,7 +177,7 @@ static int __kprobes uprobe_breakpoint_handler(struct pt_regs *regs, static int __kprobes uprobe_single_step_handler(struct pt_regs *regs, unsigned int esr) { - if (user_mode(regs)) { + if (user_mode(regs) && current->utask) { WARN_ON(instruction_pointer(regs) != current->utask->xol_vaddr + 4); -- cgit v1.2.1