Skip to content

Commit 936d064

Browse files
committed
arm64: efi: Make efi_rt_lock a raw_spinlock
jira LE-1907 cve CVE-2023-21102 Rebuild_History Non-Buildable kernel-5.14.0-284.30.1.el9_2 commit-author Pierre Gondois <[email protected]> commit 0e68b55 Running a rt-kernel base on 6.2.0-rc3-rt1 on an Ampere Altra outputs the following: BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:46 in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 9, name: kworker/u320:0 preempt_count: 2, expected: 0 RCU nest depth: 0, expected: 0 3 locks held by kworker/u320:0/9: #0: ffff3fff8c27d128 ((wq_completion)efi_rts_wq){+.+.}-{0:0}, at: process_one_work (./include/linux/atomic/atomic-long.h:41) #1: ffff80000861bdd0 ((work_completion)(&efi_rts_work.work)){+.+.}-{0:0}, at: process_one_work (./include/linux/atomic/atomic-long.h:41) #2: ffffdf7e1ed3e460 (efi_rt_lock){+.+.}-{3:3}, at: efi_call_rts (drivers/firmware/efi/runtime-wrappers.c:101) Preemption disabled at: efi_virtmap_load (./arch/arm64/include/asm/mmu_context.h:248) CPU: 0 PID: 9 Comm: kworker/u320:0 Tainted: G W 6.2.0-rc3-rt1 Hardware name: WIWYNN Mt.Jade Server System B81.03001.0005/Mt.Jade Motherboard, BIOS 1.08.20220218 (SCP: 1.08.20220218) 2022/02/18 Workqueue: efi_rts_wq efi_call_rts Call trace: dump_backtrace (arch/arm64/kernel/stacktrace.c:158) show_stack (arch/arm64/kernel/stacktrace.c:165) dump_stack_lvl (lib/dump_stack.c:107 (discriminator 4)) dump_stack (lib/dump_stack.c:114) __might_resched (kernel/sched/core.c:10134) rt_spin_lock (kernel/locking/rtmutex.c:1769 (discriminator 4)) efi_call_rts (drivers/firmware/efi/runtime-wrappers.c:101) [...] This seems to come from commit ff7a167 ("arm64: efi: Execute runtime services from a dedicated stack") which adds a spinlock. This spinlock is taken through: efi_call_rts() \-efi_call_virt() \-efi_call_virt_pointer() \-arch_efi_call_virt_setup() Make 'efi_rt_lock' a raw_spinlock to avoid being preempted. [ardb: The EFI runtime services are called with a different set of translation tables, and are permitted to use the SIMD registers. The context switch code preserves/restores neither, and so EFI calls must be made with preemption disabled, rather than only disabling migration.] Fixes: ff7a167 ("arm64: efi: Execute runtime services from a dedicated stack") Signed-off-by: Pierre Gondois <[email protected]> Cc: <[email protected]> # v6.1+ Signed-off-by: Ard Biesheuvel <[email protected]> (cherry picked from commit 0e68b55) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 87a37f0 commit 936d064

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

arch/arm64/include/asm/efi.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);
2525
({ \
2626
efi_virtmap_load(); \
2727
__efi_fpsimd_begin(); \
28-
spin_lock(&efi_rt_lock); \
28+
raw_spin_lock(&efi_rt_lock); \
2929
})
3030

3131
#undef arch_efi_call_virt
@@ -34,12 +34,12 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);
3434

3535
#define arch_efi_call_virt_teardown() \
3636
({ \
37-
spin_unlock(&efi_rt_lock); \
37+
raw_spin_unlock(&efi_rt_lock); \
3838
__efi_fpsimd_end(); \
3939
efi_virtmap_unload(); \
4040
})
4141

42-
extern spinlock_t efi_rt_lock;
42+
extern raw_spinlock_t efi_rt_lock;
4343
efi_status_t __efi_rt_asm_wrapper(void *, const char *, ...);
4444

4545
#define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT)

arch/arm64/kernel/efi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ asmlinkage efi_status_t efi_handle_corrupted_x18(efi_status_t s, const char *f)
129129
return s;
130130
}
131131

132-
DEFINE_SPINLOCK(efi_rt_lock);
132+
DEFINE_RAW_SPINLOCK(efi_rt_lock);
133133

134134
asmlinkage u64 *efi_rt_stack_top __ro_after_init;
135135

0 commit comments

Comments
 (0)