Module Name: src Committed By: ryo Date: Fri Aug 19 07:45:50 UTC 2022
Modified Files: src/sys/arch/aarch64/aarch64: pmap.c Log Message: When accessed in mmap by the device pager, pmap_enter() may be called with prot == PROT_WRITE. To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 src/sys/arch/aarch64/aarch64/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/aarch64/aarch64/pmap.c diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.137 src/sys/arch/aarch64/aarch64/pmap.c:1.138 --- src/sys/arch/aarch64/aarch64/pmap.c:1.137 Tue May 3 20:09:54 2022 +++ src/sys/arch/aarch64/aarch64/pmap.c Fri Aug 19 07:45:50 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.137 2022/05/03 20:09:54 skrll Exp $ */ +/* $NetBSD: pmap.c,v 1.138 2022/08/19 07:45:50 ryo Exp $ */ /* * Copyright (c) 2017 Ryo Shimizu <r...@nerv.org> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.137 2022/05/03 20:09:54 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.138 2022/08/19 07:45:50 ryo Exp $"); #include "opt_arm_debug.h" #include "opt_cpuoptions.h" @@ -1914,7 +1914,7 @@ _pmap_enter(struct pmap *pm, vaddr_t va, KASSERT_PM_ADDR(pm, va); KASSERT(!IN_DIRECTMAP_ADDR(va)); - KASSERT(prot & VM_PROT_READ); + KASSERT((prot & VM_PROT_ALL) != VM_PROT_NONE); #ifdef PMAPCOUNTERS PMAP_COUNT(mappings);