linux/arch/arm64
Dave Martin 0fe42512b2 arm64: Fix syscall restarting around signal suppressed by tracer
Commit 17c2895 ("arm64: Abstract syscallno manipulation") abstracts
out the pt_regs.syscallno value for a syscall cancelled by a tracer
as NO_SYSCALL, and provides helpers to set and check for this
condition.  However, the way this was implemented has the
unintended side-effect of disabling part of the syscall restart
logic.

This comes about because the second in_syscall() check in
do_signal() re-evaluates the "in a syscall" condition based on the
updated pt_regs instead of the original pt_regs.  forget_syscall()
is explicitly called prior to the second check in order to prevent
restart logic in the ret_to_user path being spuriously triggered,
which means that the second in_syscall() check always yields false.

This triggers a failure in
tools/testing/selftests/seccomp/seccomp_bpf.c, when using ptrace to
suppress a signal that interrups a nanosleep() syscall.

Misbehaviour of this type is only expected in the case where a
tracer suppresses a signal and the target process is either being
single-stepped or the interrupted syscall attempts to restart via
-ERESTARTBLOCK.

This patch restores the old behaviour by performing the
in_syscall() check only once at the start of the function.

Fixes: 17c2895860 ("arm64: Abstract syscallno manipulation")
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Reported-by: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: <stable@vger.kernel.org> # 4.14.x-
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2018-06-08 13:21:39 +01:00
..
boot This pull request contains Broadcom ARM64-based SoCs Device Tree fixes 2018-04-27 10:21:18 +02:00
configs arm64: defconfig: add CONFIG_UNIPHIER_THERMAL and CONFIG_SNI_AVE 2018-03-27 15:31:19 +02:00
crypto kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers 2018-04-07 19:04:02 +09:00
include arm64: KVM: Move VCPU_WORKAROUND_2_FLAG macros to the top of the file 2018-06-02 10:42:54 +01:00
kernel arm64: Fix syscall restarting around signal suppressed by tracer 2018-06-08 13:21:39 +01:00
kvm arm64: KVM: Add ARCH_WORKAROUND_2 discovery through ARCH_FEATURES_FUNC_ID 2018-05-31 18:00:59 +01:00
lib arm64: avoid instrumenting atomic_ll_sc.o 2018-04-27 12:14:44 +01:00
mm arm64: Unify kernel fault reporting 2018-05-23 11:46:42 +01:00
net bpf, arm64: fix out of bounds access in tail call 2018-02-22 16:06:28 -08:00
xen arm64: mm: Add additional parameter to uaccess_ttbr0_disable 2018-01-17 13:57:49 +01:00
Kconfig arm64: Add ARCH_WORKAROUND_2 probing 2018-05-31 17:34:38 +01:00
Kconfig.debug arm64: relocation testing module 2017-04-04 17:03:32 +01:00
Kconfig.platforms arm64: add Renesas R8A77965 support 2018-03-13 19:05:58 +01:00
Makefile arm64: support __int128 with clang 2018-04-24 19:07:55 +01:00