From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 20:41:45 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB73D1065672;
	Sat, 30 Jan 2010 20:41:45 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C92C8FC1A;
	Sat, 30 Jan 2010 20:41:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UKfjqW002884;
	Sat, 30 Jan 2010 20:41:45 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UKfjCg002882;
	Sat, 30 Jan 2010 20:41:45 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001302041.o0UKfjCg002882@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 20:41:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203249 - projects/capabilities8/sys/vm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2010 20:41:45 -0000

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;