Skip to content

Commit 91fbfad

Browse files
clementlegerjfvogel
authored andcommitted
riscv: misaligned: enable IRQs while handling misaligned accesses
[ Upstream commit 453805f0a28fc5091e46145e6560c776f7c7a611 ] We can safely reenable IRQs if coming from userspace. This allows to access user memory that could potentially trigger a page fault. Fixes: b686ecd ("riscv: misaligned: Restrict user access to kernel memory") Signed-off-by: Clément Léger <cleger@rivosinc.com> Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com> Link: https://lore.kernel.org/r/20250422162324.956065-3-cleger@rivosinc.com Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com> Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit d6b013b44e448383fc9ddc3d2fad5646e875cb73) Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
1 parent 280f11f commit 91fbfad

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

arch/riscv/kernel/traps.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,19 +220,23 @@ static void do_trap_misaligned(struct pt_regs *regs, enum misaligned_access_type
220220
{
221221
irqentry_state_t state;
222222

223-
if (user_mode(regs))
223+
if (user_mode(regs)) {
224224
irqentry_enter_from_user_mode(regs);
225-
else
225+
local_irq_enable();
226+
} else {
226227
state = irqentry_nmi_enter(regs);
228+
}
227229

228230
if (misaligned_handler[type].handler(regs))
229231
do_trap_error(regs, SIGBUS, BUS_ADRALN, regs->epc,
230232
misaligned_handler[type].type_str);
231233

232-
if (user_mode(regs))
234+
if (user_mode(regs)) {
235+
local_irq_disable();
233236
irqentry_exit_to_user_mode(regs);
234-
else
237+
} else {
235238
irqentry_nmi_exit(regs, state);
239+
}
236240
}
237241

238242
asmlinkage __visible __trap_section void do_trap_load_misaligned(struct pt_regs *regs)

0 commit comments

Comments
 (0)