Skip to content

Commit d35652a

Browse files
kirylIngo Molnar
authored andcommitted
x86/alternatives: Disable KASAN in apply_alternatives()
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 <fei.yang@intel.com> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20231012100424.1456-1-kirill.shutemov@linux.intel.com
1 parent f454b18 commit d35652a

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
@@ -403,6 +403,17 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
403403
u8 insn_buff[MAX_PATCH_LEN];
404404

405405
DPRINTK(ALT, "alt table %px, -> %px", start, end);
406+
407+
/*
408+
* In the case CONFIG_X86_5LEVEL=y, KASAN_SHADOW_START is defined using
409+
* cpu_feature_enabled(X86_FEATURE_LA57) and is therefore patched here.
410+
* During the process, KASAN becomes confused seeing partial LA57
411+
* conversion and triggers a false-positive out-of-bound report.
412+
*
413+
* Disable KASAN until the patching is complete.
414+
*/
415+
kasan_disable_current();
416+
406417
/*
407418
* The scan order should be from start to end. A later scanned
408419
* alternative code can overwrite previously scanned alternative code.
@@ -452,6 +463,8 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
452463

453464
text_poke_early(instr, insn_buff, insn_buff_sz);
454465
}
466+
467+
kasan_enable_current();
455468
}
456469

457470
static inline bool is_jcc32(struct insn *insn)

0 commit comments

Comments
 (0)