From owner-p4-projects@FreeBSD.ORG  Sun Jan 18 10:40:28 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A4761065679; Sun, 18 Jan 2009 10:40:28 +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 2A651106566B
	for <perforce@freebsd.org>; Sun, 18 Jan 2009 10:40:28 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 172698FC25
	for <perforce@freebsd.org>; Sun, 18 Jan 2009 10:40:28 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IAeRMt042801
	for <perforce@freebsd.org>; Sun, 18 Jan 2009 10:40:27 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IAeRGT042799
	for perforce@freebsd.org; Sun, 18 Jan 2009 10:40:27 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 18 Jan 2009 10:40:27 GMT
Message-Id: <200901181040.n0IAeRGT042799@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 156319 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Sun, 18 Jan 2009 10:40:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=156319

Change 156319 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 10:39:35

	proc_reap() requires the process spinlock, so assert it, and acquire
	when calling it from procdesc_close().

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#8 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#8 (text+ko) ====

@@ -726,6 +726,7 @@
 
 	sx_assert(&proctree_lock, SA_XLOCKED);
 	PROC_LOCK_ASSERT(p, MA_OWNED);
+	PROC_SLOCK_ASSERT(p, MA_OWNED);
 	KASSERT(p->p_state == PRS_ZOMBIE, ("proc_reap: !PRS_ZOMBIE"));
 
 	q = td->td_proc;

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#3 (text+ko) ====

@@ -317,6 +317,7 @@
 		 * the process descriptor when it calls back into
 		 * procdesc_reap().
 		 */
+		PROC_SLOCK(p);
 		proc_reap(curthread, p, NULL, 0, NULL);
 	} else {
 		/*