Skip to content

Commit 54c5639

Browse files
AlexGhitipalmer-dabbelt
authored andcommitted
riscv: Fix asan-stack clang build
Nathan reported that because KASAN_SHADOW_OFFSET was not defined in Kconfig, it prevents asan-stack from getting disabled with clang even when CONFIG_KASAN_STACK is disabled: fix this by defining the corresponding config. Reported-by: Nathan Chancellor <[email protected]> Signed-off-by: Alexandre Ghiti <[email protected]> Fixes: 8ad8b72 ("riscv: Add KASAN support") Cc: [email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent cf11d01 commit 54c5639

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

arch/riscv/Kconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,12 @@ config PAGE_OFFSET
163163
default 0xffffffff80000000 if 64BIT && MAXPHYSMEM_2GB
164164
default 0xffffffe000000000 if 64BIT && MAXPHYSMEM_128GB
165165

166+
config KASAN_SHADOW_OFFSET
167+
hex
168+
depends on KASAN_GENERIC
169+
default 0xdfffffc800000000 if 64BIT
170+
default 0xffffffff if 32BIT
171+
166172
config ARCH_FLATMEM_ENABLE
167173
def_bool !NUMA
168174

arch/riscv/include/asm/kasan.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
#define KASAN_SHADOW_SIZE (UL(1) << ((CONFIG_VA_BITS - 1) - KASAN_SHADOW_SCALE_SHIFT))
3131
#define KASAN_SHADOW_START KERN_VIRT_START
3232
#define KASAN_SHADOW_END (KASAN_SHADOW_START + KASAN_SHADOW_SIZE)
33-
#define KASAN_SHADOW_OFFSET (KASAN_SHADOW_END - (1ULL << \
34-
(64 - KASAN_SHADOW_SCALE_SHIFT)))
33+
#define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL)
3534

3635
void kasan_init(void);
3736
asmlinkage void kasan_early_init(void);

arch/riscv/mm/kasan_init.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ asmlinkage void __init kasan_early_init(void)
1717
uintptr_t i;
1818
pgd_t *pgd = early_pg_dir + pgd_index(KASAN_SHADOW_START);
1919

20+
BUILD_BUG_ON(KASAN_SHADOW_OFFSET !=
21+
KASAN_SHADOW_END - (1UL << (64 - KASAN_SHADOW_SCALE_SHIFT)));
22+
2023
for (i = 0; i < PTRS_PER_PTE; ++i)
2124
set_pte(kasan_early_shadow_pte + i,
2225
mk_pte(virt_to_page(kasan_early_shadow_page),

0 commit comments

Comments
 (0)