From owner-p4-projects@FreeBSD.ORG  Fri Jan 29 18:36:34 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4145D1065672; Fri, 29 Jan 2010 18:36:34 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 06333106566B
	for <perforce@FreeBSD.org>; Fri, 29 Jan 2010 18:36:34 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E81E28FC13
	for <perforce@FreeBSD.org>; Fri, 29 Jan 2010 18:36:33 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0TIaXik087614
	for <perforce@FreeBSD.org>; Fri, 29 Jan 2010 18:36:33 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0TIaX1j087612
	for perforce@freebsd.org; Fri, 29 Jan 2010 18:36:33 GMT
	(envelope-from jona@FreeBSD.org)
Date: Fri, 29 Jan 2010 18:36:33 GMT
Message-Id: <201001291836.o0TIaX1j087612@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 173917 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jan 2010 18:36:34 -0000

http://p4web.freebsd.org/chv.cgi?CH=173917

Change 173917 by jona@jona-capsicum-kent64 on 2010/01/29 18:36:01

	Fixed an assertion in vm_map_insert which led to unnecessary panic

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_map.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_map.c#11 (text+ko) ====

@@ -1136,7 +1136,7 @@
 	    ((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;