riscv: entry: always initialize regs->a0 to -ENOSYS
Subsystems (2)
PATCH v2 1/1 riscv: entry: always initialize regs->a0 to -ENOSYS
Otherwise when the tracer changes syscall number to -1, the kernel fails to initialize a0 with -ENOSYS and subsequently fails to return the error code of the failed syscall to userspace. For example, it will break strace syscall tampering.
--- arch/riscv/kernel/traps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kernel/traps.c +2 -2
@@ -319,6 +319,7 @@ void do_trap_ecall_u(struct pt_regs *regs) regs->epc +=4 ; regs->orig_a0 = regs->a0; + regs->a0 = -ENOSYS ;riscv_v_vstate_discard (regs);
@@ -328,8 +329,7 @@ void do_trap_ecall_u(struct pt_regs *regs)if (syscall >=0 && syscall < NR_syscalls)syscall_handler (regs, syscall); -else if (syscall !=-1 ) - regs->a0 = -ENOSYS ; +/* * Ultimately, this value will get limited by KSTACK_OFFSET_MAX(), * so the maximum stack offset is 1k bytes (10 bits).
Signature · 1 line
2.45.2
This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (fixes)
by Palmer Dabbelt <[email protected]>:
Quoted 5 lines · On Thu, 27 Jun 2024 22:23:39 +0800 you wrote:
Otherwise when the tracer changes syscall number to -1, the kernel fails to initialize a0 with
-ENOSYSand subsequently fails to return the error code of the failed syscall to userspace. For example, it will break strace syscall tampering.
Quoted 7 lines
Fixes 52449c17bdd1 ("riscv: entry: set a0 = -ENOSYS only when syscall != -1")Reported-by "Dmitry V. Levin" <[email protected]>Reviewed-by Björn Töpel <[email protected]>Signed-off-by Celeste Liu <[email protected]>[...]
Here is the summary with links:
- [v2] riscv: entry: always initialize regs->a0 to -ENOSYS
https://git.kernel.org/riscv/c/61119394631f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 27 lines · Celeste Liu
Otherwise when the tracer changes syscall number to -1, the kernel fails to initialize a0 with
-ENOSYSand subsequently fails to return the error code of the failed syscall to userspace. For example, it will break strace syscall tampering.Fixes 52449c17bdd1 ("riscv: entry: set a0 = -ENOSYS only when syscall != -1")Reported-by "Dmitry V. Levin" <[email protected]>Reviewed-by Björn Töpel <[email protected]>Signed-off-by Celeste Liu <[email protected]>--- arch/riscv/kernel/traps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/riscv/kernel/traps.c +1
-0@@ -319,6 +319,7 @@ void do_trap_ecall_u(struct pt_regs *regs) regs->epc +=4 ; regs->orig_a0 = regs->a0; + regs->a0 = -ENOSYS ;riscv_v_vstate_discard (regs);
arch/riscv/kernel/traps.c void do_trap_ecall_u(struct pt_regs *regs) · line 335
Quoted 9 lines
arch/riscv/kernel/traps.c +1
-2@@ -328,8 +329,7 @@ void do_trap_ecall_u(struct pt_regs *regs)if (syscall >=0 && syscall < NR_syscalls)syscall_handler (regs, syscall); -else if (syscall !=-1 ) - regs->a0 = -ENOSYS ; +/* * Ultimately, this value will get limited by KSTACK_OFFSET_MAX(), * so the maximum stack offset is 1k bytes (10 bits).
Hi,
this change seems to have broken strace's test suite.
In particular, the "legacy_syscall_info" test, which is meant to verify that strace behaves correctly when PTRACE_GET_SYSCALL_INFO is not available, reports a bogus value for the first argument of the syscall (the one passed via a0).
The bogus value comes directly from the ptrace() call, before strace has a chance to meddle with it, hence why the maintainer suggested that the issue would likely be traced back to the kernel.
I have built a kernel with this change reverted and, as expected, the strace test suite passes. Admittedly I've used the 6.11-rc7 Fedora kernel as the baseline for this test, but none of the Fedora patches touch the RISC-V code at all and the file itself hasn't been touched since rc7, so I'm fairly confident the same behavior is present in vanilla 6.11 too.
See
https://github.com/strace/strace/issues/315
for the original report. Please let me know if I need to provide additional information, report this anywhere else (bugzilla?), and so on...
Thanks!
Signature · 1 line
Andrea Bolognani / Red Hat / Virtualization
Quoted 58 lines · Andrea Bolognani
Quoted 27 lines · Celeste Liu
Otherwise when the tracer changes syscall number to -1, the kernel fails to initialize a0 with
-ENOSYSand subsequently fails to return the error code of the failed syscall to userspace. For example, it will break strace syscall tampering.Fixes 52449c17bdd1 ("riscv: entry: set a0 = -ENOSYS only when syscall != -1")Reported-by "Dmitry V. Levin" <[email protected]>Reviewed-by Björn Töpel <[email protected]>Signed-off-by Celeste Liu <[email protected]>--- arch/riscv/kernel/traps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/riscv/kernel/traps.c +1
-0@@ -319,6 +319,7 @@ void do_trap_ecall_u(struct pt_regs *regs) regs->epc +=4 ; regs->orig_a0 = regs->a0; + regs->a0 = -ENOSYS ;riscv_v_vstate_discard (regs);arch/riscv/kernel/traps.c void do_trap_ecall_u(struct pt_regs *regs) · line 335
Quoted 9 lines
arch/riscv/kernel/traps.c +1
-2@@ -328,8 +329,7 @@ void do_trap_ecall_u(struct pt_regs *regs)if (syscall >=0 && syscall < NR_syscalls)syscall_handler (regs, syscall); -else if (syscall !=-1 ) - regs->a0 = -ENOSYS ; +/* * Ultimately, this value will get limited by KSTACK_OFFSET_MAX(), * so the maximum stack offset is 1k bytes (10 bits). Hi,
this change seems to have broken strace's test suite.
In particular, the "
legacy_syscall_info" test, which is meant to verify that strace behaves correctly whenPTRACE_GET_SYSCALL_INFOis not available, reports a bogus value for the first argument of the syscall (the one passed via a0).The bogus value comes directly from the
ptrace()call, before strace has a chance to meddle with it, hence why the maintainer suggested that the issue would likely be traced back to the kernel.I have built a kernel with this change reverted and, as expected, the strace test suite passes. Admittedly I've used the 6.11-rc7 Fedora kernel as the baseline for this test, but none of the Fedora patches touch the RISC-V code at all and the file itself hasn't been touched since rc7, so I'm fairly confident the same behavior is present in vanilla 6.11 too.
Quoted 7 lines
See
https://github.com/strace/strace/issues/315
for the original report. Please let me know if I need to provide additional information, report this anywhere else (bugzilla?), and so on...
By the way, in strace we had to apply a workaround [1] for the riscv ptrace regression caused by commit 52449c17bdd1540940e21511612b58acebc49c06.
As result, reverting commit 61119394631f219e23ce98bcc3eb993a64a8ea64 that fixed the regression but introduced a PTRACE_GETREGSET syscall argument clobbering which is more serious regression seems to be the least of two evils.
This essentially means strace would have to keep the workaround indefinitely, but we can live with that.
[1] https://github.com/strace/strace/commit/c3ae2b27732952663a3600269884e363cb77a024
Signature · 6 lines
ldv _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv