shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 02:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

kasan: enable kasan on arm32 [1/2]

Browse Source 
PD#SWPL-128513

Problem:
enable kasan on arm32 will crash

Solution:
disable AMLOGIC_VMAP when kasan enabled
increase modules region form 16M to 32M

Verify:
TXHD2

Change-Id: Ia909a2f3522f5d994a6b74f2e853f10d0a7ac6ca
Signed-off-by: song.han <song.han@amlogic.com>
This commit is contained in:
song.han
2023-06-20 15:59:42 +08:00
committed by Dongjin Kim
parent f36dd9bc49
commit fea0de9e4e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/Kconfig
View File

@@ -1286,7 +1286,8 @@ config KASAN_SHADOW_OFFSET
depends on KASAN
default 0x1f000000 if PAGE_OFFSET=0x40000000
default 0x5f000000 if PAGE_OFFSET=0x80000000
default 0x9f000000 if PAGE_OFFSET=0xC0000000
default 0x9e000000 if PAGE_OFFSET=0xC0000000 && AMLOGIC_ARM_KASAN=y
default 0x9f000000 if PAGE_OFFSET=0xC0000000 && AMLOGIC_ARM_KASAN=n
default 0x8f000000 if PAGE_OFFSET=0xB0000000
default 0xffffffff

4
arch/arm/include/asm/memory.h
View File

@@ -64,7 +64,11 @@
#define MODULES_VADDR (PAGE_OFFSET - SZ_64M)
#else
#ifndef CONFIG_THUMB2_KERNEL
#ifdef CONFIG_AMLOGIC_ARM_KASAN
#define MODULES_VADDR (PAGE_OFFSET - SZ_32M)
#else
#define MODULES_VADDR (PAGE_OFFSET - SZ_16M)
#endif
#else
/* smaller range for Thumb-2 symbols relocation (2^24)*/
#define MODULES_VADDR (PAGE_OFFSET - SZ_8M)