From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753864AbdKXRYz (ORCPT ); Fri, 24 Nov 2017 12:24:55 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:44424 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753793AbdKXRYv (ORCPT ); Fri, 24 Nov 2017 12:24:51 -0500 X-Google-Smtp-Source: AGs4zMZrTgO+w6q6PDVukus4PNSkfjSd9e8HHs8JZ5KZsnHiokf0IlshPl7vahPnVTbVj0W1dVmy0g== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Dave Hansen , Andy Lutomirski , Thomas Gleixner , "H . Peter Anvin" , Peter Zijlstra , Borislav Petkov , Linus Torvalds Subject: [PATCH 06/43] x86/kasan/64: Teach KASAN about the cpu_entry_area Date: Fri, 24 Nov 2017 18:23:34 +0100 Message-Id: <20171124172411.19476-7-mingo@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171124172411.19476-1-mingo@kernel.org> References: <20171124172411.19476-1-mingo@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andy Lutomirski The cpu_entry_area will contain stacks. Make sure that KASAN has appropriate shadow mappings for them. Signed-off-by: Andy Lutomirski Signed-off-by: Thomas Gleixner Cc: Alexander Potapenko Cc: Andrey Ryabinin Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Dmitry Vyukov Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: kasan-dev@googlegroups.com Link: https://lkml.kernel.org/r/8407adf9126440d6467dade88fdb3e3b75fc1019.1511497875.git.luto@kernel.org Signed-off-by: Ingo Molnar --- 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