Skip to content

Commit 4be91e0

Browse files
covanammehmetb0
authored andcommitted
riscv: Fix sleeping in invalid context in die()
BugLink: https://bugs.launchpad.net/bugs/2106770 commit 6a97f4118ac07cfdc316433f385dbdc12af5025e upstream. die() can be called in exception handler, and therefore cannot sleep. However, die() takes spinlock_t which can sleep with PREEMPT_RT enabled. That causes the following warning: BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 285, name: mutex preempt_count: 110001, expected: 0 RCU nest depth: 0, expected: 0 CPU: 0 UID: 0 PID: 285 Comm: mutex Not tainted 6.12.0-rc7-00022-ge19049cf7d56-dirty #234 Hardware name: riscv-virtio,qemu (DT) Call Trace: dump_backtrace+0x1c/0x24 show_stack+0x2c/0x38 dump_stack_lvl+0x5a/0x72 dump_stack+0x14/0x1c __might_resched+0x130/0x13a rt_spin_lock+0x2a/0x5c die+0x24/0x112 do_trap_insn_illegal+0xa0/0xea _new_vmalloc_restore_context_a0+0xcc/0xd8 Oops - illegal instruction [#1] Switch to use raw_spinlock_t, which does not sleep even with PREEMPT_RT enabled. Fixes: 76d2a04 ("RISC-V: Init and Halt Code") Signed-off-by: Nam Cao <[email protected]> Cc: [email protected] Reviewed-by: Sebastian Andrzej Siewior <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> CVE-2024-57939 Signed-off-by: Manuel Diewald <[email protected]> Signed-off-by: Mehmet Basaran <[email protected]>
1 parent 4fab607 commit 4be91e0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/riscv/kernel/traps.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
int show_unhandled_signals = 1;
3636

37-
static DEFINE_SPINLOCK(die_lock);
37+
static DEFINE_RAW_SPINLOCK(die_lock);
3838

3939
static int copy_code(struct pt_regs *regs, u16 *val, const u16 *insns)
4040
{
@@ -80,7 +80,7 @@ void die(struct pt_regs *regs, const char *str)
8080

8181
oops_enter();
8282

83-
spin_lock_irqsave(&die_lock, flags);
83+
raw_spin_lock_irqsave(&die_lock, flags);
8484
console_verbose();
8585
bust_spinlocks(1);
8686

@@ -99,7 +99,7 @@ void die(struct pt_regs *regs, const char *str)
9999

100100
bust_spinlocks(0);
101101
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
102-
spin_unlock_irqrestore(&die_lock, flags);
102+
raw_spin_unlock_irqrestore(&die_lock, flags);
103103
oops_exit();
104104

105105
if (in_interrupt())

0 commit comments

Comments
 (0)