Module Name: src
Committed By: jmcneill
Date: Sat Jan 9 13:42:25 UTC 2021
Modified Files:
src/sys/arch/aarch64/aarch64: pmapboot.c
Log Message:
Fix a potential issue in pmapboot_enter_range and pmapboot_enter where
if the va and size are not page aligned, there is a possibility of the
last page not being taken into consideration.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/aarch64/aarch64/pmapboot.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/aarch64/aarch64/pmapboot.c
diff -u src/sys/arch/aarch64/aarch64/pmapboot.c:1.14 src/sys/arch/aarch64/aarch64/pmapboot.c:1.15
--- src/sys/arch/aarch64/aarch64/pmapboot.c:1.14 Fri Dec 11 18:03:33 2020
+++ src/sys/arch/aarch64/aarch64/pmapboot.c Sat Jan 9 13:42:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pmapboot.c,v 1.14 2020/12/11 18:03:33 skrll Exp $ */
+/* $NetBSD: pmapboot.c,v 1.15 2021/01/09 13:42:25 jmcneill Exp $ */
/*
* Copyright (c) 2018 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmapboot.c,v 1.14 2020/12/11 18:03:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmapboot.c,v 1.15 2021/01/09 13:42:25 jmcneill Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -240,8 +240,8 @@ pmapboot_enter(vaddr_t va, paddr_t pa, p
va, pa, size, blocksize, attr);
pa &= ~(blocksize - 1);
+ va_end = (va + size + blocksize - 1) & ~(blocksize - 1);
va &= ~(blocksize - 1);
- va_end = (va + size + blocksize- 1) & ~(blocksize - 1);
#ifdef OPTIMIZE_TLB_CONTIG
va_start = va;
#endif
@@ -473,8 +473,8 @@ pmapboot_enter_range(vaddr_t va, paddr_t
vsize_t left, mapsize, nblocks;
int nskip = 0;
- va = trunc_page(va);
vend = round_page(va + size);
+ va = trunc_page(va);
left = vend - va;
/* align the start address to L2 blocksize */
