Module Name: src
Committed By: skrll
Date: Sat Aug 29 06:49:53 UTC 2020
Modified Files:
src/sys/arch/arm/include/arm32: vmparam.h
Log Message:
Cover the full kernel address range in KASAN
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/arm/include/arm32/vmparam.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/arm32/vmparam.h
diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.54 src/sys/arch/arm/include/arm32/vmparam.h:1.55
--- src/sys/arch/arm/include/arm32/vmparam.h:1.54 Sat Jul 11 06:46:19 2020
+++ src/sys/arch/arm/include/arm32/vmparam.h Sat Aug 29 06:49:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.54 2020/07/11 06:46:19 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.55 2020/08/29 06:49:53 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -127,7 +127,7 @@
#ifdef KASAN
#define VM_KERNEL_KASAN_BASE 0xc0000000
-#define VM_KERNEL_KASAN_SIZE (VM_KERNEL_VM_SIZE >> KASAN_SHADOW_SCALE_SHIFT)
+#define VM_KERNEL_KASAN_SIZE (VM_KERNEL_ADDR_SIZE >> KASAN_SHADOW_SCALE_SHIFT)
#define VM_KERNEL_KASAN_END (VM_KERNEL_KASAN_BASE + VM_KERNEL_KASAN_SIZE)
#define VM_KERNEL_VM_END VM_KERNEL_KASAN_BASE
#else
@@ -143,6 +143,7 @@
#define VM_KERNEL_VM_BASE 0x90000000
#endif
+#define VM_KERNEL_ADDR_SIZE (VM_KERNEL_VM_END - KERNEL_BASE)
#define VM_KERNEL_VM_SIZE (VM_KERNEL_VM_END - VM_KERNEL_VM_BASE)
#define VM_KERNEL_IO_ADDRESS 0xf0000000
