From: Celeste Liu <coelacanthushex@gmail.com>
To: linux-riscv@lists.infradead.org, "Björn Töpel" <bjorn@rivosinc.com>
Cc: linux-kernel@vger.kernel.org, "Dmitry V . Levin" <ldv@strace.io>,
Guo Ren <guoren@kernel.org>, Palmer Dabbelt <palmer@rivosinc.com>,
Emil Renner Berthing <emil.renner.berthing@canonical.com>,
Felix Yan <felixonmars@archlinux.org>,
Ruizhe Pan <c141028@gmail.com>,
Celeste Liu <CoelacanthusHex@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH] riscv: entry: always initialize regs->a0 to -ENOSYS
Date: Thu, 27 Jun 2024 18:32:06 +0800 [thread overview]
Message-ID: <20240627103205.27914-2-CoelacanthusHex@gmail.com> (raw)
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.
Fixes: 52449c17bdd1 ("riscv: entry: set a0 = -ENOSYS only when syscall != -1")
Cc: stable@vger.kernel.org
Signed-off-by: Celeste Liu <CoelacanthusHex@gmail.com>
---
arch/riscv/kernel/traps.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c
index 05a16b1f0aee..51ebfd23e007 100644
--- a/arch/riscv/kernel/traps.c
+++ b/arch/riscv/kernel/traps.c
@@ -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).
--
2.45.2
next reply other threads:[~2024-06-27 10:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-27 10:32 Celeste Liu [this message]
2024-06-27 14:08 ` [PATCH] riscv: entry: always initialize regs->a0 to -ENOSYS Björn Töpel
2024-06-27 14:29 ` Celeste Liu
2024-06-27 15:48 ` Björn Töpel
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=20240627103205.27914-2-CoelacanthusHex@gmail.com \
--to=coelacanthushex@gmail.com \
--cc=bjorn@rivosinc.com \
--cc=c141028@gmail.com \
--cc=emil.renner.berthing@canonical.com \
--cc=felixonmars@archlinux.org \
--cc=guoren@kernel.org \
--cc=ldv@strace.io \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@rivosinc.com \
--cc=stable@vger.kernel.org \
/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