Module Name: src
Committed By: scole
Date: Sat Apr 8 20:59:27 UTC 2017
Modified Files:
src/sys/arch/ia64/ia64: pmap.c
Log Message:
Fix a possible infinite loop in pmap_kremove()
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/ia64/ia64/pmap.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/ia64/ia64/pmap.c
diff -u src/sys/arch/ia64/ia64/pmap.c:1.35 src/sys/arch/ia64/ia64/pmap.c:1.36
--- src/sys/arch/ia64/ia64/pmap.c:1.35 Sat Apr 8 18:08:33 2017
+++ src/sys/arch/ia64/ia64/pmap.c Sat Apr 8 20:59:27 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.35 2017/04/08 18:08:33 scole Exp $ */
+/* $NetBSD: pmap.c,v 1.36 2017/04/08 20:59:27 scole Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.35 2017/04/08 18:08:33 scole Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.36 2017/04/08 20:59:27 scole Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2110,11 +2110,12 @@ void
pmap_kremove(vaddr_t va, vsize_t size)
{
struct ia64_lpte *pte;
-
+ vaddr_t eva = va + size;
+
UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
UVMHIST_LOG(maphist, "(va=%#lx)", va, 0, 0, 0);
- while (size > 0) {
+ while (va < eva) {
pte = pmap_find_kpte(va);
if (pmap_present(pte)) {
KASSERT(pmap_managed(pte) != 0);
@@ -2123,7 +2124,6 @@ pmap_kremove(vaddr_t va, vsize_t size)
pmap_clear_present(pte);
}
va += PAGE_SIZE;
- size -= PAGE_SIZE;
}
}
