From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 12:32:27 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1B7421065695; Fri,  2 Oct 2009 12:32:27 +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 D4257106568B
	for <perforce@freebsd.org>; Fri,  2 Oct 2009 12:32:26 +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 C20388FC13
	for <perforce@freebsd.org>; Fri,  2 Oct 2009 12:32:26 +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 n92CWQxb008467
	for <perforce@freebsd.org>; Fri, 2 Oct 2009 12:32:26 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 n92CWQC5008465
	for perforce@freebsd.org; Fri, 2 Oct 2009 12:32:26 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 2 Oct 2009 12:32:26 GMT
Message-Id: <200910021232.n92CWQC5008465@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 169127 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: Fri, 02 Oct 2009 12:32:27 -0000

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

Change 169127 by rwatson@rwatson_freebsd_capabilities on 2009/10/02 12:32:03

	Close a race in which a process managed using a process descriptor is
	exiting simultaneously with the process descriptor being closed by
	extending coverage of the proctree lock during close.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#13 edit

Differences ...

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

@@ -337,11 +337,11 @@
 	pd = fp->f_data;
 	fp->f_ops = &badfileops;
 	fp->f_data = NULL;
+
+	sx_xlock(&proctree_lock);
 	PROCDESC_LOCK(pd);
 	pd->pd_flags |= PD_CLOSED;
 	PROCDESC_UNLOCK(pd);
-
-	sx_xlock(&proctree_lock);
 	p = pd->pd_proc;
 	PROC_LOCK(p);
 	if (p->p_state == PRS_ZOMBIE) {