Module Name: src
Committed By: rin
Date: Sat Jun 17 11:28:13 UTC 2023
Modified Files:
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
Log Message:
Panic if kernel image is not fit within its VA range,
rather than silently freeze later.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
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/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.39 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.40
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.39 Sat Jun 17 11:24:20 2023
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Sat Jun 17 11:28:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.39 2023/06/17 11:24:20 rin Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.40 2023/06/17 11:28:13 rin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.39 2023/06/17 11:24:20 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.40 2023/06/17 11:28:13 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -630,6 +630,9 @@ initarm(void *arg)
logical += pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
physical_start + logical, totalsize - textsize,
VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
+
+ if (KERNEL_BASE + logical >= KERNEL_VM_BASE)
+ panic("VA for kernel image exhausted.");
}
#ifdef VERBOSE_INIT_ARM
