ARM: ptrace: Restore syscall restart tracing
authorKees Cook <keescook@chromium.org>
Thu, 10 Aug 2023 19:54:18 +0000 (12:54 -0700)
committerKees Cook <keescook@chromium.org>
Wed, 16 Aug 2023 20:58:49 +0000 (13:58 -0700)
commitcf007647475b5090819c5fe8da771073145c7334
treed43117ed7568e5f4fa9ecdbf23f491f36122eb57
parentfbc5d382407eb5d6a2eeef245cc2ca278d590645
ARM: ptrace: Restore syscall restart tracing

Since commit 4e57a4ddf6b0 ("ARM: 9107/1: syscall: always store
thread_info->abi_syscall"), the seccomp selftests "syscall_restart" has
been broken. This was caused by the restart syscall not being stored to
"abi_syscall" during restart setup before branching to the "local_restart"
label. Tracers would see the wrong syscall, and scno would get overwritten
while returning from the TIF_WORK path. Add the missing store.

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-1-keescook@chromium.org
Signed-off-by: Kees Cook <keescook@chromium.org>
arch/arm/kernel/entry-common.S