diff mbox series

[04/10] arm/kasan: fix the array size of kasan_early_shadow_pte[]

Message ID 20210112234914.NwudbAxXv%akpm@linux-foundation.org (mailing list archive)
State New, archived
Headers show
Series [01/10] mm, slub: consider rest of partial list if acquire_slab() fails | expand

Commit Message

Andrew Morton Jan. 12, 2021, 11:49 p.m. UTC 
From: Hailong Liu <liu.hailong6@zte.com.cn>
Subject: arm/kasan: fix the array size of kasan_early_shadow_pte[]

The size of kasan_early_shadow_pte[] now is PTRS_PER_PTE which defined to
512 for arm architecture.  This means that it only covers the prev Linux
pte entries, but not the HWTABLE pte entries for arm.

The reason it works well current is that the symbol
kasan_early_shadow_page immediately following kasan_early_shadow_pte in
memory is page aligned, which makes kasan_early_shadow_pte look like a 4KB
size array.  But we can't ensure the order always right with different
compiler/linker, nor more bss symbols be introduced.

We had a test with QEMU + vexpress：put a 512KB-size symbol with
attribute __section(".bss..page_aligned") after kasan_early_shadow_pte,
and poison it after kasan_early_init().  Then enabled CONFIG_KASAN, it
failed to boot up.

Link: https://lkml.kernel.org/r/20210109044622.8312-1-hailongliiu@yeah.net
Signed-off-by: Hailong Liu <liu.hailong6@zte.com.cn>
Signed-off-by: Ziliang Guo <guo.ziliang@zte.com.cn>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/kasan.h |    6 +++++-
 mm/kasan/init.c       |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)
diff mbox series

Patch

--- a/include/linux/kasan.h~arm-kasan-fix-the-arry-size-of-kasan_early_shadow_pte
+++ a/include/linux/kasan.h
@@ -35,8 +35,12 @@  struct kunit_kasan_expectation {
 #define KASAN_SHADOW_INIT 0
 #endif
 
+#ifndef PTE_HWTABLE_PTRS
+#define PTE_HWTABLE_PTRS 0
+#endif
+
 extern unsigned char kasan_early_shadow_page[PAGE_SIZE];
-extern pte_t kasan_early_shadow_pte[PTRS_PER_PTE];
+extern pte_t kasan_early_shadow_pte[PTRS_PER_PTE + PTE_HWTABLE_PTRS];
 extern pmd_t kasan_early_shadow_pmd[PTRS_PER_PMD];
 extern pud_t kasan_early_shadow_pud[PTRS_PER_PUD];
 extern p4d_t kasan_early_shadow_p4d[MAX_PTRS_PER_P4D];
--- a/mm/kasan/init.c~arm-kasan-fix-the-arry-size-of-kasan_early_shadow_pte
+++ a/mm/kasan/init.c
@@ -64,7 +64,8 @@  static inline bool kasan_pmd_table(pud_t
 	return false;
 }
 #endif
-pte_t kasan_early_shadow_pte[PTRS_PER_PTE] __page_aligned_bss;
+pte_t kasan_early_shadow_pte[PTRS_PER_PTE + PTE_HWTABLE_PTRS]
+	__page_aligned_bss;
 
 static inline bool kasan_pte_table(pmd_t pmd)
 {