From: "Clément Léger" <cleger@rivosinc.com>
To: Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
linux-riscv@lists.infradead.org (open list:RISC-V ARCHITECTURE),
linux-kernel@vger.kernel.org (open list)
Cc: "Clément Léger" <cleger@rivosinc.com>,
"Samuel Holland" <samuel.holland@sifive.com>,
"Alexandre Ghiti" <alexghiti@rivosinc.com>
Subject: [PATCH v2] riscv: misaligned: disable pagefault before accessing user memory
Date: Mon, 6 Jan 2025 18:09:08 +0100 [thread overview]
Message-ID: <20250106170911.1403467-1-cleger@rivosinc.com> (raw)
Calling copy_{from/to}_user() in interrupt context might actually sleep
and display a BUG message:
[ 10.377019] BUG: sleeping function called from invalid context at include/linux/uaccess.h:162
[ 10.379868] in_atomic(): 0, irqs_disabled(): 1, non_block: 0, pid: 88, name: ssh-keygen
[ 10.380009] preempt_count: 0, expected: 0
[ 10.380324] CPU: 0 UID: 0 PID: 88 Comm: ssh-keygen Not tainted 6.13.0-rc5-00013-g3435cd5f1331-dirty #19
[ 10.380639] Hardware name: riscv-virtio,qemu (DT)
[ 10.380798] Call Trace:
[ 10.381108] [<ffffffff80013d30>] dump_backtrace+0x1c/0x24
[ 10.381690] [<ffffffff800022d8>] show_stack+0x28/0x34
[ 10.381812] [<ffffffff8000ee1c>] dump_stack_lvl+0x4a/0x68
[ 10.381958] [<ffffffff8000ee4e>] dump_stack+0x14/0x1c
[ 10.382047] [<ffffffff80065e0a>] __might_resched+0xfa/0x104
[ 10.382172] [<ffffffff80065e56>] __might_sleep+0x42/0x66
[ 10.382267] [<ffffffff801b0c5e>] __might_fault+0x1c/0x24
[ 10.382363] [<ffffffff804415e4>] _copy_from_user+0x28/0xc2
[ 10.382459] [<ffffffff800152ca>] handle_misaligned_load+0x1ca/0x2fc
[ 10.382565] [<ffffffff80a033a0>] do_trap_load_misaligned+0x24/0xee
[ 10.382714] [<ffffffff80a0dc66>] handle_exception+0x146/0x152
In order to safely handle user memory access from this context, disable
page fault while copying user memory. Although this might lead to copy
failure in some cases (offlined page), this is the best we can try to be
safe. While at it, replace __get_user by get_user() to actually check
for memory before accessing it and disable fault.
Fixes: b686ecdeacf6 ("riscv: misaligned: Restrict user access to kernel memory")
Signed-off-by: Clément Léger <cleger@rivosinc.com>
---
V2:
- Add pagefault disable/enable around get_user()
arch/riscv/kernel/traps_misaligned.c | 30 +++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/arch/riscv/kernel/traps_misaligned.c b/arch/riscv/kernel/traps_misaligned.c
index 7cc108aed74e..d9a6e44ae745 100644
--- a/arch/riscv/kernel/traps_misaligned.c
+++ b/arch/riscv/kernel/traps_misaligned.c
@@ -268,7 +268,9 @@ static unsigned long get_f32_rs(unsigned long insn, u8 fp_reg_offset,
int __ret; \
\
if (user_mode(regs)) { \
- __ret = __get_user(insn, (type __user *) insn_addr); \
+ pagefault_disable(); \
+ __ret = get_user(insn, (type __user *) insn_addr); \
+ pagefault_enable(); \
} else { \
insn = *(type *)insn_addr; \
__ret = 0; \
@@ -355,7 +357,7 @@ static int handle_scalar_misaligned_load(struct pt_regs *regs)
{
union reg_data val;
unsigned long epc = regs->epc;
- unsigned long insn;
+ unsigned long insn, copy_len;
unsigned long addr = regs->badaddr;
int fp = 0, shift = 0, len = 0;
@@ -441,7 +443,16 @@ static int handle_scalar_misaligned_load(struct pt_regs *regs)
val.data_u64 = 0;
if (user_mode(regs)) {
- if (copy_from_user(&val, (u8 __user *)addr, len))
+ /*
+ * We can not sleep in exception context. Disable pagefault to
+ * avoid a potential sleep while accessing user memory. Side
+ * effect is that if it would have sleep, then the copy will
+ * fail.
+ */
+ pagefault_disable();
+ copy_len = copy_from_user(&val, (u8 __user *)addr, len);
+ pagefault_enable();
+ if (copy_len)
return -1;
} else {
memcpy(&val, (u8 *)addr, len);
@@ -463,7 +474,7 @@ static int handle_scalar_misaligned_store(struct pt_regs *regs)
{
union reg_data val;
unsigned long epc = regs->epc;
- unsigned long insn;
+ unsigned long insn, copy_len;
unsigned long addr = regs->badaddr;
int len = 0, fp = 0;
@@ -539,7 +550,16 @@ static int handle_scalar_misaligned_store(struct pt_regs *regs)
return -EOPNOTSUPP;
if (user_mode(regs)) {
- if (copy_to_user((u8 __user *)addr, &val, len))
+ /*
+ * We can not sleep in exception context. Disable pagefault to
+ * avoid a potential sleep while accessing user memory. Side
+ * effect is that if it would have sleep, then the copy will
+ * fail.
+ */
+ pagefault_disable();
+ copy_len = copy_to_user((u8 __user *)addr, &val, len);
+ pagefault_enable();
+ if (copy_len)
return -1;
} else {
memcpy((u8 *)addr, &val, len);
--
2.47.1
reply other threads:[~2025-01-06 17:09 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=20250106170911.1403467-1-cleger@rivosinc.com \
--to=cleger@rivosinc.com \
--cc=alexghiti@rivosinc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=samuel.holland@sifive.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
all inboxes | Powered by JetHome®