From: Jinjie Ruan <ruanjinjie@huawei.com>
To: <catalin.marinas@arm.com>, <will@kernel.org>, <oleg@redhat.com>,
<tglx@kernel.org>, <peterz@infradead.org>, <luto@kernel.org>,
<kees@kernel.org>, <wad@chromium.org>, <ruanjinjie@huawei.com>,
<linusw@kernel.org>, <kevin.brodsky@arm.com>,
<yeoreum.yun@arm.com>, <ldv@strace.io>, <song@kernel.org>,
<thuth@redhat.com>, <ryan.roberts@arm.com>,
<mark.rutland@arm.com>, <ada.coupriediaz@arm.com>,
<anshuman.khandual@arm.com>, <broonie@kernel.org>,
<liqiang01@kylinos.cn>, <pengcan@kylinos.cn>,
<mathieu.desnoyers@efficios.com>, <mingo@kernel.org>,
<edumazet@google.com>, <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v14 05/10] arm64: ptrace: Move rseq_syscall() before audit_syscall_exit()
Date: Fri, 20 Mar 2026 18:26:15 +0800 [thread overview]
Message-ID: <20260320102620.1336796-6-ruanjinjie@huawei.com> (raw)
In-Reply-To: <20260320102620.1336796-1-ruanjinjie@huawei.com>
Move the rseq_syscall() check earlier in the syscall exit path to ensure
it operates on the original instruction pointer (regs->pc) before any
potential modification by a tracer.
[Background]
When CONFIG_DEBUG_RSEQ is enabled, rseq_syscall() verifies that a system
call was not executed within an rseq critical section by examining
regs->pc. If a violation is detected, it triggers a SIGSEGV.
[Problem]
Currently, arm64 invokes rseq_syscall() after report_syscall_exit().
However, during report_syscall_exit(), a ptrace tracer can modify the
task's instruction pointer via PTRACE_SETREGS. This leads to an
inconsistency where rseq may analyze a post-trace PC instead of the
actual PC at the time of syscall exit.
[Why this matters]
The rseq check is intended to validate the execution context of the
syscall itself. Analyzing a tracer-modified PC can lead to incorrect
detection or missed violations. Moving the check earlier ensures rseq
sees the authentic state of the task.
[Alignment]
This change aligns arm64 with:
- Generic entry, which calls rseq_syscall() first.
- arm32 implementation, which also performs the check before audit.
[Impact]
There is no functional change to signal delivery; SIGSEGV will still be
processed in arm64_exit_to_user_mode() at the end of the exit path.
Cc: Thomas Gleixner <tglx@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Reviewed-by: Yeoreum Yun <yeoreum.yun@arm.com>
Reviewed-by: Kevin Brodsky <kevin.brodsky@arm.com>
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
arch/arm64/kernel/ptrace.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
index a908e05749c1..8245d1ae61cf 100644
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -2456,6 +2456,8 @@ int syscall_trace_enter(struct pt_regs *regs, unsigned long flags)
void syscall_trace_exit(struct pt_regs *regs, unsigned long flags)
{
+ rseq_syscall(regs);
+
audit_syscall_exit(regs);
if (flags & _TIF_SYSCALL_TRACEPOINT)
@@ -2463,8 +2465,6 @@ void syscall_trace_exit(struct pt_regs *regs, unsigned long flags)
if (flags & (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP))
report_syscall_exit(regs);
-
- rseq_syscall(regs);
}
/*
--
2.34.1
next prev parent reply other threads:[~2026-03-20 10:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-20 10:26 [PATCH v14 00/10] arm64: entry: Convert to Generic Entry Jinjie Ruan
2026-03-20 10:26 ` [PATCH v14 01/10] arm64/ptrace: Refactor syscall_trace_enter/exit() to accept flags parameter Jinjie Ruan
2026-03-20 10:26 ` [PATCH v14 02/10] arm64/ptrace: Use syscall_get_nr() helper for syscall_trace_enter() Jinjie Ruan
2026-03-20 10:26 ` [PATCH v14 03/10] arm64/ptrace: Expand secure_computing() in place Jinjie Ruan
2026-03-20 10:26 ` [PATCH v14 04/10] arm64/ptrace: Use syscall_get_arguments() helper for audit Jinjie Ruan
2026-03-20 10:26 ` Jinjie Ruan [this message]
2026-03-20 10:26 ` [PATCH v14 06/10] arm64: syscall: Introduce syscall_exit_to_user_mode_work() Jinjie Ruan
2026-03-20 10:26 ` [PATCH v14 07/10] arm64/ptrace: Define and use _TIF_SYSCALL_EXIT_WORK Jinjie Ruan
2026-03-20 10:26 ` [PATCH v14 08/10] arm64/ptrace: Skip syscall exit reporting for PTRACE_SYSEMU_SINGLESTEP Jinjie Ruan
2026-03-20 10:26 ` [PATCH v14 09/10] arm64: entry: Convert to generic entry Jinjie Ruan
2026-03-20 10:26 ` [PATCH v14 10/10] arm64: Inline el0_svc_common() Jinjie Ruan
2026-04-09 6:29 ` [PATCH v14 00/10] arm64: entry: Convert to Generic Entry Jinjie Ruan
2026-04-09 7:36 ` Mark Rutland
2026-04-10 2:16 ` Jinjie Ruan
2026-04-09 16:14 ` Kees Cook
2026-04-10 2:09 ` Jinjie Ruan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260320102620.1336796-6-ruanjinjie@huawei.com \
--to=ruanjinjie@huawei.com \
--cc=ada.coupriediaz@arm.com \
--cc=anshuman.khandual@arm.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=edumazet@google.com \
--cc=kees@kernel.org \
--cc=kevin.brodsky@arm.com \
--cc=ldv@strace.io \
--cc=linusw@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liqiang01@kylinos.cn \
--cc=luto@kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=pengcan@kylinos.cn \
--cc=peterz@infradead.org \
--cc=ryan.roberts@arm.com \
--cc=song@kernel.org \
--cc=tglx@kernel.org \
--cc=thuth@redhat.com \
--cc=wad@chromium.org \
--cc=will@kernel.org \
--cc=yeoreum.yun@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox