From: Zishun Yi <vulab@iscas.ac.cn>
To: pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: alex@ghiti.fr, ajones@ventanamicro.com, cleger@rivosinc.com,
charlie@rivosinc.com, schwab@suse.de, namcao@linutronix.de,
Zishun Yi <vulab@iscas.ac.cn>
Subject: [PATCH v2] riscv: misaligned: Restore epc in error path
Date: Sat, 9 May 2026 15:40:53 +0800 [thread overview]
Message-ID: <20260509074053.1748061-1-vulab@iscas.ac.cn> (raw)
In handle_scalar_misaligned_store/load, regs->epc is temporarily set to
0. And be restored in the first error path. But it not restore for the
rest of the error path. This cause the epc corrupted.
Fix this by restore epc in fp error and copy_from_user error.
Fixes: 7c586a555a48 ("riscv: add floating point insn support to misaligned access emulation")
Fixes: 441381506ba7 ("riscv: misaligned: remove CONFIG_RISCV_M_MODE specific code")
Assisted-by: Gemini:gemini-3.1-pro
Signed-off-by: Zishun Yi <vulab@iscas.ac.cn>
---
Changes in v2:
- Added 'Assisted-by' tag.
arch/riscv/kernel/traps_misaligned.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/arch/riscv/kernel/traps_misaligned.c b/arch/riscv/kernel/traps_misaligned.c
index 2a27d3ff4ac6..24f898853bba 100644
--- a/arch/riscv/kernel/traps_misaligned.c
+++ b/arch/riscv/kernel/traps_misaligned.c
@@ -307,13 +307,17 @@ static int handle_scalar_misaligned_load(struct pt_regs *regs)
return -1;
}
- if (!IS_ENABLED(CONFIG_FPU) && fp)
+ if (!IS_ENABLED(CONFIG_FPU) && fp) {
+ regs->epc = epc;
return -EOPNOTSUPP;
+ }
val.data_u64 = 0;
if (user_mode(regs)) {
- if (copy_from_user(&val, (u8 __user *)addr, len))
+ if (copy_from_user(&val, (u8 __user *)addr, len)) {
+ regs->epc = epc;
return -1;
+ }
} else {
memcpy(&val, (u8 *)addr, len);
}
@@ -409,12 +413,16 @@ static int handle_scalar_misaligned_store(struct pt_regs *regs)
return -1;
}
- if (!IS_ENABLED(CONFIG_FPU) && fp)
+ if (!IS_ENABLED(CONFIG_FPU) && fp) {
+ regs->epc = epc;
return -EOPNOTSUPP;
+ }
if (user_mode(regs)) {
- if (copy_to_user((u8 __user *)addr, &val, len))
+ if (copy_to_user((u8 __user *)addr, &val, len)) {
+ regs->epc = epc;
return -1;
+ }
} else {
memcpy((u8 *)addr, &val, len);
}
--
2.51.2
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
reply other threads:[~2026-05-09 7:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20260509074053.1748061-1-vulab@iscas.ac.cn \
--to=vulab@iscas.ac.cn \
--cc=ajones@ventanamicro.com \
--cc=alex@ghiti.fr \
--cc=aou@eecs.berkeley.edu \
--cc=charlie@rivosinc.com \
--cc=cleger@rivosinc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=namcao@linutronix.de \
--cc=palmer@dabbelt.com \
--cc=pjw@kernel.org \
--cc=schwab@suse.de \
/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