aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/ptrace.c
diff options
context:
space:
mode:
authorKeno Fischer <keno@juliacomputing.com>2021-02-01 19:21:09 -0500
committerWill Deacon <will@kernel.org>2021-02-02 21:07:56 +0000
commit12fc4288408a8799409f7fa62a526b60e92da334 (patch)
tree743c1a871d9d6f558f42ee83cd4e5a2ff9344833 /arch/arm64/kernel/ptrace.c
parentKVM: arm64: Move __hyp_set_vectors out of .hyp.text (diff)
downloadlinux-dev-12fc4288408a8799409f7fa62a526b60e92da334.tar.xz
linux-dev-12fc4288408a8799409f7fa62a526b60e92da334.zip
arm64: ptrace: Fix missing return in hw breakpoint code
When delivering a hw-breakpoint SIGTRAP to a compat task via ptrace, the lack of a 'return' statement means we fallthrough to the native case, which differs in its handling of 'si_errno'. Although this looks to be harmless because the subsequent signal is effectively ignored, it's confusing and unintentional, so add the missing 'return'. Signed-off-by: Keno Fischer <keno@juliacomputing.com> Link: https://lore.kernel.org/r/20210202002109.GA624440@juliacomputing.com Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/ptrace.c')
-rw-r--r--arch/arm64/kernel/ptrace.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
index 8ac487c84e37..3d5c8afca75b 100644
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -194,6 +194,7 @@ static void ptrace_hbptriggered(struct perf_event *bp,
}
arm64_force_sig_ptrace_errno_trap(si_errno, bkpt->trigger,
desc);
+ return;
}
#endif
arm64_force_sig_fault(SIGTRAP, TRAP_HWBKPT, bkpt->trigger, desc);