ARM: ptrace: Restore syscall skipping for tracers
authorKees Cook <keescook@chromium.org>
Thu, 10 Aug 2023 19:54:19 +0000 (12:54 -0700)
committerKees Cook <keescook@chromium.org>
Wed, 16 Aug 2023 20:58:49 +0000 (13:58 -0700)
commit4697b5848bd933f68ebd04836362c8de0cacaf71
tree25b3e2385221302d871873c25acb54059b44d835
parentcf007647475b5090819c5fe8da771073145c7334
ARM: ptrace: Restore syscall skipping for tracers

Since commit 4e57a4ddf6b0 ("ARM: 9107/1: syscall: always store
thread_info->abi_syscall"), the seccomp selftests "syscall_errno"
and "syscall_faked" have been broken. Both seccomp and PTRACE depend
on using the special value of "-1" for skipping syscalls. This value
wasn't working because it was getting masked by __NR_SYSCALL_MASK in
both PTRACE_SET_SYSCALL and get_syscall_nr().

Explicitly test for -1 in PTRACE_SET_SYSCALL and get_syscall_nr(),
leaving it exposed when present, allowing tracers to skip syscalls
again.

Cc: Russell King <linux@armlinux.org.uk>
Cc: Arnd Bergmann <arnd@kernel.org>
Cc: Lecopzer Chen <lecopzer.chen@mediatek.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: linux-arm-kernel@lists.infradead.org
Fixes: 4e57a4ddf6b0 ("ARM: 9107/1: syscall: always store thread_info->abi_syscall")
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20230810195422.2304827-2-keescook@chromium.org
Signed-off-by: Kees Cook <keescook@chromium.org>
arch/arm/include/asm/syscall.h
arch/arm/kernel/ptrace.c