Skip to content

Commit 6788b10

Browse files
kirylgregkh
authored andcommitted
x86/alternatives: Disable KASAN in apply_alternatives()
commit d35652a upstream. Fei has reported that KASAN triggers during apply_alternatives() on a 5-level paging machine: BUG: KASAN: out-of-bounds in rcu_is_watching() Read of size 4 at addr ff110003ee6419a0 by task swapper/0/0 ... __asan_load4() rcu_is_watching() trace_hardirqs_on() text_poke_early() apply_alternatives() ... On machines with 5-level paging, cpu_feature_enabled(X86_FEATURE_LA57) gets patched. It includes KASAN code, where KASAN_SHADOW_START depends on __VIRTUAL_MASK_SHIFT, which is defined with cpu_feature_enabled(). KASAN gets confused when apply_alternatives() patches the KASAN_SHADOW_START users. A test patch that makes KASAN_SHADOW_START static, by replacing __VIRTUAL_MASK_SHIFT with 56, works around the issue. Fix it for real by disabling KASAN while the kernel is patching alternatives. [ mingo: updated the changelog ] Fixes: 6657fca ("x86/mm: Allow to boot without LA57 if CONFIG_X86_5LEVEL=y") Reported-by: Fei Yang <[email protected]> Signed-off-by: Kirill A. Shutemov <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Kirill A. Shutemov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ba4b377 commit 6788b10

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

arch/x86/kernel/alternative.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,17 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
424424
u8 insn_buff[MAX_PATCH_LEN];
425425

426426
DPRINTK("alt table %px, -> %px", start, end);
427+
428+
/*
429+
* In the case CONFIG_X86_5LEVEL=y, KASAN_SHADOW_START is defined using
430+
* cpu_feature_enabled(X86_FEATURE_LA57) and is therefore patched here.
431+
* During the process, KASAN becomes confused seeing partial LA57
432+
* conversion and triggers a false-positive out-of-bound report.
433+
*
434+
* Disable KASAN until the patching is complete.
435+
*/
436+
kasan_disable_current();
437+
427438
/*
428439
* The scan order should be from start to end. A later scanned
429440
* alternative code can overwrite previously scanned alternative code.
@@ -491,6 +502,8 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
491502
next:
492503
optimize_nops(instr, a->instrlen);
493504
}
505+
506+
kasan_enable_current();
494507
}
495508

496509
#if defined(CONFIG_RETPOLINE) && defined(CONFIG_STACK_VALIDATION)

0 commit comments

Comments
 (0)