diff options
| author | Kees Cook <[email protected]> | 2023-08-10 12:54:18 -0700 |
|---|---|---|
| committer | Kees Cook <[email protected]> | 2023-08-16 13:58:49 -0700 |
| commit | cf007647475b5090819c5fe8da771073145c7334 (patch) | |
| tree | d43117ed7568e5f4fa9ecdbf23f491f36122eb57 | |
| parent | fbc5d382407eb5d6a2eeef245cc2ca278d590645 (diff) | |
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 <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Lecopzer Chen <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: [email protected]
Fixes: 4e57a4ddf6b0 ("ARM: 9107/1: syscall: always store thread_info->abi_syscall")
Reviewed-by: Arnd Bergmann <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Kees Cook <[email protected]>
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index bcc4c9ec3aa4..5c31e9de7a60 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -90,6 +90,7 @@ slow_work_pending: cmp r0, #0 beq no_work_pending movlt scno, #(__NR_restart_syscall - __NR_SYSCALL_BASE) + str scno, [tsk, #TI_ABI_SYSCALL] @ make sure tracers see update ldmia sp, {r0 - r6} @ have to reload r0 - r6 b local_restart @ ... and off we go ENDPROC(ret_fast_syscall) |