aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Capper <steve.capper@linaro.org>2015-01-26 15:10:33 +0000
committerSteve Capper <steve.capper@linaro.org>2015-01-27 16:46:21 +0000
commit271fe8b11ad3cbbc2dccf4ba42178a8b00197fe3 (patch)
tree5c9c3648396a1d2b5b133ee5a98bb92b7683c24c
parent723a2a41e441e00955a36e9e646ff1ec5c9f84f9 (diff)
downloadlinux-271fe8b11ad3cbbc2dccf4ba42178a8b00197fe3.tar.gz
Fixup for uprobesto-yazen
Waiting for this patch series to come out on lakml before commenting on this. Signed-off-by: Steve Capper <steve.capper@linaro.org>
-rw-r--r--arch/arm64/kernel/uprobes.c2
1 files changed, 1 insertions, 1 deletions
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);