svn commit: r266780 - head/sys/vm

Konstantin Belousov kib at FreeBSD.org
Wed May 28 00:45:36 UTC 2014


Author: kib
Date: Wed May 28 00:45:35 2014
New Revision: 266780
URL: http://svnweb.freebsd.org/changeset/base/266780

Log:
  Remove the assert which can be triggered by the userspace.  The
  situation checked by assert is verified to not take place in
  vm_map_wire(), and protection permissions on the wired entry can be
  revoked afterward.
  
  Reported by:	markj
  Reviewed by:	alc
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/vm/vm_map.c

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c	Wed May 28 00:30:32 2014	(r266779)
+++ head/sys/vm/vm_map.c	Wed May 28 00:45:35 2014	(r266780)
@@ -1986,11 +1986,8 @@ vm_map_protect(vm_map_t map, vm_offset_t
 		 */
 		if ((current->eflags & MAP_ENTRY_USER_WIRED) != 0 &&
 		    (current->protection & VM_PROT_WRITE) != 0 &&
-		    (old_prot & VM_PROT_WRITE) == 0) {
-			KASSERT(old_prot != VM_PROT_NONE,
-			    ("vm_map_protect: inaccessible wired map entry"));
+		    (old_prot & VM_PROT_WRITE) == 0)
 			vm_fault_copy_entry(map, map, current, current, NULL);
-		}
 
 		/*
 		 * When restricting access, update the physical map.  Worry


More information about the svn-src-head mailing list