From owner-p4-projects@FreeBSD.ORG  Sat Nov 22 11:01:26 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CA24816A4D0; Sat, 22 Nov 2003 11:01:25 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A4AC716A4CE
	for <perforce@freebsd.org>; Sat, 22 Nov 2003 11:01:25 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0928F43F3F
	for <perforce@freebsd.org>; Sat, 22 Nov 2003 11:01:25 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAMJ1OXJ011339
	for <perforce@freebsd.org>; Sat, 22 Nov 2003 11:01:24 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAMJ1OuF011336
	for perforce@freebsd.org; Sat, 22 Nov 2003 11:01:24 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 22 Nov 2003 11:01:24 -0800 (PST)
Message-Id: <200311221901.hAMJ1OuF011336@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>
Subject: PERFORCE change 42941 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 22 Nov 2003 19:01:26 -0000

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

Change 42941 by rwatson@rwatson_powerbook on 2003/11/22 11:00:45

	Lock the vnode before performing an access control check for
	VOP_READDIRATTR().

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vfs_syscalls.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vfs_syscalls.c#11 (text+ko) ====

@@ -3519,12 +3519,14 @@
         auio.uio_resid = uap->buffersize;
         
         loff = auio.uio_offset = fp->f_offset;
+        vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
 #ifdef MAC
 	error = mac_check_vnode_readdir(p->p_ucred, vp);
-	if (error)
+	if (error) {
+		VOP_UNLOCK(vp, 0, p);
 		return (error);
+	}
 #endif
-        vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
         error = VOP_READDIRATTR (vp, &attributelist, &auio,
                    actualcount, uap->options, &newstate, &eofflag,
                    &actualcount, ((u_long **)0), p->p_ucred);