svn commit: r203249 - projects/capabilities8/sys/vm

[Robert Watson]

Author: rwatson
Date: Sat Jan 30 20:41:45 2010
New Revision: 203249
URL: http://svn.freebsd.org/changeset/base/203249

Log:
  Merge c173917 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Fixed an assertion in vm_map_insert which led to unnecessary panic.
  
  Submitted by:	Jonathan Anderson <jonathan.anderson at cl.cam.ac.uk>

Modified:
  projects/capabilities8/sys/vm/vm_map.c

Modified: projects/capabilities8/sys/vm/vm_map.c
==============================================================================
--- projects/capabilities8/sys/vm/vm_map.c	Sat Jan 30 20:40:03 2010	(r203248)
+++ projects/capabilities8/sys/vm/vm_map.c	Sat Jan 30 20:41:45 2010	(r203249)
@@ -1136,7 +1136,7 @@ vm_map_insert(vm_map_t map, vm_object_t 
 	    ((protoeflags & MAP_ENTRY_NEEDS_COPY) || object == NULL))) {
 		if (!(cow & MAP_ACC_CHARGED) && !swap_reserve(end - start))
 			return (KERN_RESOURCE_SHORTAGE);
-		KASSERT(object == NULL || (cow & MAP_ENTRY_NEEDS_COPY) ||
+		KASSERT(object == NULL || (protoeflags & MAP_ENTRY_NEEDS_COPY) ||
 		    object->uip == NULL,
 		    ("OVERCOMMIT: vm_map_insert o %p", object));
 		uip = curthread->td_ucred->cr_ruidinfo;