[PATCH v21 12/15] arm64: ptrace: Return bool from arm64_syscall_trace_enter()

From: Jinjie Ruan

Date: Wed Nov 11 2026 - 06:48:58 EST


In preparation for migrating arm64 to the generic entry infrastructure,
decouple the decision to run the system call from the syscall number.
arm64_syscall_trace_enter() now returns a bool, like generic entry's
syscall_trace_enter(), instead of overloading NO_SYSCALL (-1):

- false: do not run the system call (ptrace or seccomp rejected it)
- true: run it, after re-reading the syscall number from regs

When it returns true, el0_svc_common() re-reads the syscall number and
still skips invoke_syscall() if it is NO_SYSCALL. A tracer skips a
system call by setting the number to -1 and its own return value in x0;
calling invoke_syscall() would overwrite that x0 with -ENOSYS from
sys_ni_syscall().

The user-visible behaviour does not change:

- syscall(-1) issued by userspace still returns -ENOSYS.
- A tracer skip with a custom x0 still returns that x0.
- A tracer skip without setting x0 still returns the original x0.
- Normal system calls and seccomp rejections are unaffected.

No functional changes intended.

Cc: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Will Deacon <will@xxxxxxxxxx>
Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Ada Couprie Diaz <ada.coupriediaz@xxxxxxx>
Reviewed-by: Linus Walleij <linusw@xxxxxxxxxx>
Signed-off-by: Jinjie Ruan <ruanjinjie@xxxxxxxxxx>
---
arch/arm64/include/asm/syscall.h | 2 +-
arch/arm64/kernel/ptrace.c | 8 ++++----
arch/arm64/kernel/syscall.c | 6 +++++-
3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h
index 7cc872fde019..f19d4a8824ba 100644
--- a/arch/arm64/include/asm/syscall.h
+++ b/arch/arm64/include/asm/syscall.h
@@ -121,7 +121,7 @@ static inline int syscall_get_arch(struct task_struct *task)
return AUDIT_ARCH_AARCH64;
}

-int arm64_syscall_trace_enter(struct pt_regs *regs, unsigned long flags);
+bool arm64_syscall_trace_enter(struct pt_regs *regs, unsigned long flags);
void arm64_syscall_exit_work(struct pt_regs *regs, unsigned long flags);

static __always_inline void arm64_syscall_exit_to_user_mode_work(struct pt_regs *regs)
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
index 4c2bdd37d67d..d3c52c9a1105 100644
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -2470,14 +2470,14 @@ static inline void syscall_enter_audit(struct pt_regs *regs)
static inline void syscall_enter_audit(struct pt_regs *regs) { }
#endif

-int arm64_syscall_trace_enter(struct pt_regs *regs, unsigned long flags)
+bool arm64_syscall_trace_enter(struct pt_regs *regs, unsigned long flags)
{
int ret;

if (flags & (_TIF_SYSCALL_EMU | _TIF_SYSCALL_TRACE)) {
ret = report_syscall_entry(regs);
if (ret || (flags & _TIF_SYSCALL_EMU))
- return NO_SYSCALL;
+ return false;

/* ptrace might have changed thread flags */
flags = read_thread_flags();
@@ -2486,7 +2486,7 @@ int arm64_syscall_trace_enter(struct pt_regs *regs, unsigned long flags)
/* Do the secure computing after ptrace; failures should be fast. */
if (unlikely(flags & _TIF_SECCOMP)) {
if (!__seccomp_permit_syscall())
- return NO_SYSCALL;
+ return false;
}

if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
@@ -2495,7 +2495,7 @@ int arm64_syscall_trace_enter(struct pt_regs *regs, unsigned long flags)
if (unlikely(audit_context()))
syscall_enter_audit(regs);

- return syscall_get_nr(current, regs);
+ return true;
}

static inline bool report_single_step(unsigned long flags)
diff --git a/arch/arm64/kernel/syscall.c b/arch/arm64/kernel/syscall.c
index 3488afd45d20..72c6e8b7ab21 100644
--- a/arch/arm64/kernel/syscall.c
+++ b/arch/arm64/kernel/syscall.c
@@ -108,7 +108,11 @@ static void el0_svc_common(struct pt_regs *regs, int scno, int sc_nr,
*/
if (scno == NO_SYSCALL)
syscall_set_return_value(current, regs, -ENOSYS, 0);
- scno = arm64_syscall_trace_enter(regs, read_thread_flags());
+ if (!arm64_syscall_trace_enter(regs, read_thread_flags()))
+ goto trace_exit;
+
+ /* Reread the syscall number as it might have been modified */
+ scno = syscall_get_nr(current, regs);
if (scno == NO_SYSCALL)
goto trace_exit;
}
--
2.34.1