From: Jinjie Ruan <ruanjinjie@huawei.com>
To: <catalin.marinas@arm.com>, <will@kernel.org>,
<mark.rutland@arm.com>, <oleg@redhat.com>, <kees@kernel.org>,
<luto@amacapital.net>, <wad@chromium.org>, <peterz@infradead.org>,
<ada.coupriediaz@arm.com>, <linusw@kernel.org>,
<yeoreum.yun@arm.com>, <kevin.brodsky@arm.com>,
<anshuman.khandual@arm.com>, <james.morse@arm.com>,
<thuth@redhat.com>, <vladimir.murzin@arm.com>, <tglx@kernel.org>,
<broonie@kernel.org>, <liqiang01@kylinos.cn>,
<ryan.roberts@arm.com>, <pengcan@kylinos.cn>,
<kmehltretter@gmail.com>, <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Cc: <ruanjinjie@huawei.com>
Subject: [PATCH v19 05/14] arm64: ptrace: Protect rseq_syscall() from tracer PC modifications
Date: Tue, 22 Sep 2026 11:55:01 +0800 [thread overview]
Message-ID: <20260922035510.1090299-6-ruanjinjie@huawei.com> (raw)
In-Reply-To: <20260922035510.1090299-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_SETREGSET (with NT_PRSTATUS). 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: Mark Rutland <mark.rutland@arm.com>
Cc: Thomas Gleixner <tglx@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Ada Couprie Diaz <ada.coupriediaz@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 96c03922baa5..72df4b84ec9a 100644
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -2513,6 +2513,8 @@ void syscall_trace_exit(struct pt_regs *regs)
unsigned long flags = read_thread_flags();
bool step;
+ rseq_syscall(regs);
+
audit_syscall_exit(regs);
if (flags & _TIF_SYSCALL_TRACEPOINT)
@@ -2521,8 +2523,6 @@ void syscall_trace_exit(struct pt_regs *regs)
step = report_single_step(flags);
if (step || flags & _TIF_SYSCALL_TRACE)
report_syscall_exit(regs);
-
- rseq_syscall(regs);
}
/*
--
2.34.1
next prev parent reply other threads:[~2026-09-22 3:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-22 3:54 [PATCH v19 00/14] arm64: entry: Convert to Generic Entry Jinjie Ruan
2026-09-22 3:54 ` [PATCH v19 01/14] arm64: ptrace: Fix redundant syscall exit stop for PTRACE_SYSEMU_SINGLESTEP Jinjie Ruan
2026-09-23 8:28 ` Jinjie Ruan
2026-09-22 3:54 ` [PATCH v19 02/14] arm64: ptrace: Rework audit_syscall_entry() Jinjie Ruan
2026-09-22 3:54 ` [PATCH v19 03/14] arm64: ptrace: Open-code seccomp check in syscall_trace_enter() Jinjie Ruan
2026-09-22 3:55 ` [PATCH v19 04/14] arm64: ptrace: Rename and clean up syscall_trace_enter() Jinjie Ruan
2026-09-22 3:55 ` Jinjie Ruan [this message]
2026-09-22 3:55 ` [PATCH v19 06/14] arm64: syscall: Rework the syscall exit path in el0_svc_common() Jinjie Ruan
2026-09-22 3:55 ` [PATCH v19 07/14] arm64: ptrace: Pass thread flags to trace enter/exit Jinjie Ruan
2026-09-22 3:55 ` [PATCH v19 08/14] arm64: ptrace: Extract arm64_syscall_exit_to_user_mode_work() helper Jinjie Ruan
2026-09-22 3:55 ` [PATCH v19 09/14] arm64: ptrace: Align syscall exit work semantics with generic entry Jinjie Ruan
2026-09-22 3:55 ` [PATCH v19 10/14] arm64: syscall: Use exit-specific flags check in el0_svc_common() Jinjie Ruan
2026-09-22 3:55 ` [PATCH v19 11/14] arm64: syscall: Simplify el0_svc_common() syscall exit path Jinjie Ruan
2026-09-22 3:55 ` [PATCH v19 12/14] arm64: ptrace: Make return type of arm64_syscall_trace_enter() bool Jinjie Ruan
2026-09-22 3:55 ` [PATCH v19 13/14] arm64: entry: Convert to generic entry Jinjie Ruan
2026-09-22 3:55 ` [PATCH v19 14/14] arm64: Inline el0_svc_common() Jinjie Ruan
2026-09-22 18:29 ` [PATCH v19 00/14] arm64: entry: Convert to Generic Entry Kees Cook
2026-09-24 9:32 ` Jinjie Ruan
2026-09-25 0:05 ` Kees Cook
2026-09-28 1:50 ` Jinjie Ruan
2026-09-30 6:51 ` 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=20260922035510.1090299-6-ruanjinjie@huawei.com \
--to=ruanjinjie@huawei.com \
--cc=ada.coupriediaz@arm.com \
--cc=anshuman.khandual@arm.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=kees@kernel.org \
--cc=kevin.brodsky@arm.com \
--cc=kmehltretter@gmail.com \
--cc=linusw@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liqiang01@kylinos.cn \
--cc=luto@amacapital.net \
--cc=mark.rutland@arm.com \
--cc=oleg@redhat.com \
--cc=pengcan@kylinos.cn \
--cc=peterz@infradead.org \
--cc=ryan.roberts@arm.com \
--cc=tglx@kernel.org \
--cc=thuth@redhat.com \
--cc=vladimir.murzin@arm.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