lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 24 Nov 2017 18:23:34 +0100 From: Ingo Molnar <mingo@...nel.org> To: linux-kernel@...r.kernel.org Cc: Dave Hansen <dave.hansen@...ux.intel.com>, Andy Lutomirski <luto@...capital.net>, Thomas Gleixner <tglx@...utronix.de>, "H . Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, Borislav Petkov <bp@...en8.de>, Linus Torvalds <torvalds@...ux-foundation.org> Subject: [PATCH 06/43] x86/kasan/64: Teach KASAN about the cpu_entry_area From: Andy Lutomirski <luto@...nel.org> The cpu_entry_area will contain stacks. Make sure that KASAN has appropriate shadow mappings for them. Signed-off-by: Andy Lutomirski <luto@...nel.org> Signed-off-by: Thomas Gleixner <tglx@...utronix.de> Cc: Alexander Potapenko <glider@...gle.com> Cc: Andrey Ryabinin <aryabinin@...tuozzo.com> Cc: Borislav Petkov <bpetkov@...e.de> Cc: Brian Gerst <brgerst@...il.com> Cc: Dave Hansen <dave.hansen@...el.com> Cc: Dmitry Vyukov <dvyukov@...gle.com> Cc: Josh Poimboeuf <jpoimboe@...hat.com> Cc: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Peter Zijlstra <peterz@...radead.org> Cc: kasan-dev@...glegroups.com Link: https://lkml.kernel.org/r/8407adf9126440d6467dade88fdb3e3b75fc1019.1511497875.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@...nel.org> --- arch/x86/mm/kasan_init_64.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 99dfed6dfef8..54561dce742e 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -277,6 +277,7 @@ void __init kasan_early_init(void) void __init kasan_init(void) { int i; + void *cpu_entry_area_begin, *cpu_entry_area_end; #ifdef CONFIG_KASAN_INLINE register_die_notifier(&kasan_die_notifier); @@ -329,8 +330,18 @@ void __init kasan_init(void) (unsigned long)kasan_mem_to_shadow(_end), early_pfn_to_nid(__pa(_stext))); + cpu_entry_area_begin = (void *)(__fix_to_virt(FIX_CPU_ENTRY_AREA_BOTTOM)); + cpu_entry_area_end = (void *)(__fix_to_virt(FIX_CPU_ENTRY_AREA_TOP) + PAGE_SIZE); + kasan_populate_zero_shadow(kasan_mem_to_shadow((void *)MODULES_END), - (void *)KASAN_SHADOW_END); + kasan_mem_to_shadow(cpu_entry_area_begin)); + + kasan_populate_shadow((unsigned long)kasan_mem_to_shadow(cpu_entry_area_begin), + (unsigned long)kasan_mem_to_shadow(cpu_entry_area_end), + 0); + + kasan_populate_zero_shadow(kasan_mem_to_shadow(cpu_entry_area_end), + (void *)KASAN_SHADOW_END); load_cr3(init_top_pgt); __flush_tlb_all(); -- 2.14.1
Powered by blists - more mailing lists