Skip to content

Commit 565cbaa

Browse files
Lecopzer ChenRussell King (Oracle)
authored andcommitted
ARM: 9202/1: kasan: support CONFIG_KASAN_VMALLOC
Simply make shadow of vmalloc area mapped on demand. Since the virtual address of vmalloc for Arm is also between MODULE_VADDR and 0x100000000 (ZONE_HIGHMEM), which means the shadow address has already included between KASAN_SHADOW_START and KASAN_SHADOW_END. Thus we need to change nothing for memory map of Arm. This can fix ARM_MODULE_PLTS with KASan, support KASan for higmem and support CONFIG_VMAP_STACK with KASan. Signed-off-by: Lecopzer Chen <lecopzer.chen@mediatek.com> Tested-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
1 parent ff69927 commit 565cbaa

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

arch/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ config ARM
7575
select HAVE_ARCH_KFENCE if MMU && !XIP_KERNEL
7676
select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
7777
select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL
78+
select HAVE_ARCH_KASAN_VMALLOC if HAVE_ARCH_KASAN
7879
select HAVE_ARCH_MMAP_RND_BITS if MMU
7980
select HAVE_ARCH_PFN_VALID
8081
select HAVE_ARCH_SECCOMP

arch/arm/mm/kasan_init.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,11 @@ void __init kasan_init(void)
236236

237237
clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END);
238238

239-
kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_START),
239+
if (!IS_ENABLED(CONFIG_KASAN_VMALLOC))
240+
kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_START),
241+
kasan_mem_to_shadow((void *)VMALLOC_END));
242+
243+
kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_END),
240244
kasan_mem_to_shadow((void *)-1UL) + 1);
241245

242246
for_each_mem_range(i, &pa_start, &pa_end) {

0 commit comments

Comments
 (0)