powerpc/syscall: Fix syscall skip handling for seccomp and ptrace
PATCH v6 1/1 powerpc/syscall: Fix syscall skip handling for seccomp and ptrace
After enabling GENERIC_ENTRY on PowerPC, syscall_enter_from_user_mode() returns -1 as a sentinel to signal that seccomp or ptrace has intercepted the syscall and already set a return value via syscall_set_return_value(). system_call_exception() was not handling this sentinel, and since -1UL is >= NR_syscalls, the code fell into the out-of-range path and returned -ENOSYS, overwriting the errno already placed in regs->gpr[3].
The naive fix of checking r0 == -1L before the NR_syscalls bounds check is ambiguous: a user legitimately calling syscall(-1) also produces r0 == -1L, and a tracer intercepting such a call would have its injected return value silently discarded.
Fix this by introducing a thread flag that is set whenever syscall_set_return_value() explicitly updates the return value. In system_call_exception(), check and clear this flag before dispatching the syscall, and return the preset value directly when it is present. This ensures that an explicitly supplied return value always suppresses syscall execution, regardless of the syscall number.
This handles all seccomp actions correctly:
- SECCOMP_RET_ERRNO, SECCOMP_RET_TRACE (no tracer), SECCOMP_RET_USER_NOTIF:
all call syscall_set_return_value(), flag is set, injected value returned.
- SECCOMP_RET_TRAP, SECCOMP_RET_KILL: call syscall_rollback() and deliver a signal; flag is not set, but the process is dying so the return value is irrelevant.
The fix covers both ppc32 and ppc64 with no #ifdefs.
---
v5 -> v6:
- remove the pt_regs field and use preexisting thread_info flag.
v5: https://lore.kernel.org/linuxppc-dev/[email protected]/
v4 -> v5:
- Fixed build failure where BITS macro is not available
v4: https://lore.kernel.org/linuxppc-dev/[email protected]/
v3 -> v4:
- Use syscall_get_error (Michal)
v3:https://lore.kernel.org/linuxppc-dev/[email protected]/
v2 -> v3:
- Last fix is not working for -1 syscall. Fixed that with this.
v2: https://lore.kernel.org/all/[email protected]
v1 -> v2:
- Fix issues in the previous fix (Michal)
v1: https://lore.kernel.org/all/[email protected]
arch/powerpc/include/asm/syscall.h | 6 ++++++ arch/powerpc/include/asm/thread_info.h | 1 + arch/powerpc/kernel/syscall.c | 3 +++ 3 files changed, 10 insertions(+)
arch/powerpc/include/asm/syscall.h +6 -0
@@ -98,6 +98,12 @@ static inline void syscall_set_return_value(struct task_struct *task, regs->gpr[3 ] = val; } } +/* +* Mark that a return value has been explicitly set by seccomp or +* ptrace so that system_call_exception() can skip the syscall +* unconditionally, even when the user requested syscall(-1). +*/ +set_thread_flag (TIF_SYSCALL_RET ); } static inline void syscall_get_arguments(struct task_struct *task,
arch/powerpc/include/asm/thread_info.h +1 -0
@@ -119,6 +119,7 @@ void arch_setup_new_exec(void);#endif #define TIF_POLLING_NRFLAG 19/* true if poll_idle() is polling TIF_NEED_RESCHED */ #define TIF_32BIT 20/* 32 bit binary */ +#define TIF_SYSCALL_RET 21/* syscall error value set */ /* as above, but as bit values */ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
arch/powerpc/kernel/syscall.c +3 -0
@@ -22,6 +22,9 @@ notrace long system_call_exception(struct pt_regs *regs, unsigned long r0)add_random_kstack_offset (); r0 =syscall_enter_from_user_mode (regs, r0); +if (unlikely (test_and_clear_thread_flag (TIF_SYSCALL_RET ))) +return syscall_get_error (current, regs); +if (unlikely (r0 >= NR_syscalls)) {if (unlikely (trap_is_unsupported_scv (regs))) {/* Unsupported scv vector */
Signature · 1 line
2.55.0
Quoted 8 lines · Mukesh Kumar Chaurasiya (IBM)
After enabling
GENERIC_ENTRYon PowerPC,syscall_enter_from_user_mode()returns -1 as a sentinel to signal that seccomp or ptrace has intercepted the syscall and already set a return value viasyscall_set_return_value().system_call_exception()was not handling this sentinel, and since -1UL is >=NR_syscalls, the code fell into the out-of-range path and returned-ENOSYS, overwriting the errno already placed in regs->gpr[3].[...]
Applied to powerpc/next.
[1/1] powerpc/syscall: Fix syscall skip handling for seccomp and ptrace
https://git.kernel.org/powerpc/c/69cb2be898be6d5826cacd1a628f6945a24480b6
cheers