Skip to content

Commit cf00764

Browse files
committed
ARM: ptrace: Restore syscall restart tracing
Since commit 4e57a4d ("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: 4e57a4d ("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>
1 parent fbc5d38 commit cf00764

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

arch/arm/kernel/entry-common.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ slow_work_pending:
9090
cmp r0, #0
9191
beq no_work_pending
9292
movlt scno, #(__NR_restart_syscall - __NR_SYSCALL_BASE)
93+
str scno, [tsk, #TI_ABI_SYSCALL] @ make sure tracers see update
9394
ldmia sp, {r0 - r6} @ have to reload r0 - r6
9495
b local_restart @ ... and off we go
9596
ENDPROC(ret_fast_syscall)

0 commit comments

Comments
 (0)