diff options
author | Andrey Ryabinin <aryabinin@virtuozzo.com> | 2016-01-11 07:51:19 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-09 07:33:14 -0500 |
commit | 063fb3e56f6dd29b2633b678b837e1d904200e6f (patch) | |
tree | ffe61cc04b53f7a3b9f41f80e5f0a2c4acaabc35 | |
parent | 69e0210fd01ff157d332102219aaf5c26ca8069b (diff) |
x86/kasan: Write protect kasan zero shadow
After kasan_init() executed, no one is allowed to write to kasan_zero_page,
so write protect it.
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Reviewed-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/1452516679-32040-3-git-send-email-aryabinin@virtuozzo.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/mm/kasan_init_64.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 303e47045864..1b1110fa0057 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c | |||
@@ -125,10 +125,16 @@ void __init kasan_init(void) | |||
125 | 125 | ||
126 | /* | 126 | /* |
127 | * kasan_zero_page has been used as early shadow memory, thus it may | 127 | * kasan_zero_page has been used as early shadow memory, thus it may |
128 | * contain some garbage. Now we can clear it, since after the TLB flush | 128 | * contain some garbage. Now we can clear and write protect it, since |
129 | * no one should write to it. | 129 | * after the TLB flush no one should write to it. |
130 | */ | 130 | */ |
131 | memset(kasan_zero_page, 0, PAGE_SIZE); | 131 | memset(kasan_zero_page, 0, PAGE_SIZE); |
132 | for (i = 0; i < PTRS_PER_PTE; i++) { | ||
133 | pte_t pte = __pte(__pa(kasan_zero_page) | __PAGE_KERNEL_RO); | ||
134 | set_pte(&kasan_zero_pte[i], pte); | ||
135 | } | ||
136 | /* Flush TLBs again to be sure that write protection applied. */ | ||
137 | __flush_tlb_all(); | ||
132 | 138 | ||
133 | init_task.kasan_depth = 0; | 139 | init_task.kasan_depth = 0; |
134 | pr_info("KernelAddressSanitizer initialized\n"); | 140 | pr_info("KernelAddressSanitizer initialized\n"); |