CVS commit: src/sys/uvm

[Michael van Elst]

Module Name:    src
Committed By:   mlelstv
Date:           Fri Jul 12 06:27:13 UTC 2019

Modified Files:
        src/sys/uvm: uvm_map.c

Log Message:
Add missing lock around pmap_protect.
ok, chs@

Reported-by: syzbot+6bfd0be70896fc9e9...@syzkaller.appspotmail.com


To generate a diff of this commit:
cvs rdiff -u -r1.361 -r1.362 src/sys/uvm/uvm_map.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/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.361 src/sys/uvm/uvm_map.c:1.362
--- src/sys/uvm/uvm_map.c:1.361	Thu Jul 11 17:07:10 2019
+++ src/sys/uvm/uvm_map.c	Fri Jul 12 06:27:13 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_map.c,v 1.361 2019/07/11 17:07:10 maxv Exp $	*/
+/*	$NetBSD: uvm_map.c,v 1.362 2019/07/12 06:27:13 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.361 2019/07/11 17:07:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.362 2019/07/12 06:27:13 mlelstv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pax.h"
@@ -4446,9 +4446,11 @@ uvm_mapent_forkcopy(struct vm_map *new_m
 		if (old_entry->aref.ar_amap &&
 		    !UVM_ET_ISNEEDSCOPY(old_entry)) {
 			if (old_entry->max_protection & VM_PROT_WRITE) {
+				uvm_map_lock_entry(old_entry);
 				pmap_protect(old_map->pmap,
 				    old_entry->start, old_entry->end,
 				    old_entry->protection & ~VM_PROT_WRITE);
+				uvm_map_unlock_entry(old_entry);
 			}
 			old_entry->etype |= UVM_ET_NEEDSCOPY;
 		}