From owner-p4-projects@FreeBSD.ORG  Mon Mar 27 19:55:49 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8EBBD16A445; Mon, 27 Mar 2006 19:55:49 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 6592A16A442
	for <perforce@freebsd.org>; Mon, 27 Mar 2006 19:55:49 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5E33443D97
	for <perforce@freebsd.org>; Mon, 27 Mar 2006 19:55:37 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2RJtaVr043045
	for <perforce@freebsd.org>; Mon, 27 Mar 2006 19:55:37 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2RJtaOn043042
	for perforce@freebsd.org; Mon, 27 Mar 2006 19:55:36 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 27 Mar 2006 19:55:36 GMT
Message-Id: <200603271955.k2RJtaOn043042@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94125 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: Mon, 27 Mar 2006 19:55:49 -0000

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

Change 94125 by jhb@jhb_slimer on 2006/03/27 19:55:01

	Conditionalize Giant around vn_open.

Affected files ...

.. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#3 edit

Differences ...

==== //depot/projects/smpng/sys/security/audit/audit_syscalls.c#3 (text) ====

@@ -520,7 +520,7 @@
 	struct ucred *cred;
 	struct vnode *vp;
 	int error = 0;
-	int flags;
+	int flags, vfslocked;
 
 	error = suser(td);
 	if (error)
@@ -539,25 +539,21 @@
 	if (uap->path == NULL)
 		return (EINVAL);
 
-	/*
-	 * XXXAUDIT: Giant may no longer be required here.
-	 */
-	mtx_lock(&Giant);
-	NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, td);
+	NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE, UIO_USERSPACE,
+	    uap->path, td);
 	flags = AUDIT_OPEN_FLAGS;
 	error = vn_open(&nd, &flags, 0, -1);
-	if (error) {
-		mtx_unlock(&Giant);
-		goto err_out;
-	}
+	if (error)
+		return (error);
+	vfslocked = NDHASGIANT(&nd);
 	VOP_UNLOCK(nd.ni_vp, 0, td);
 	vp = nd.ni_vp;
 	if (vp->v_type != VREG) {
 		vn_close(vp, AUDIT_CLOSE_FLAGS, td->td_ucred, td);
-		mtx_unlock(&Giant);
-		error = EINVAL;
-		goto err_out;
+		VFS_UNLOCK_GIANT(vfslocked);
+		return (EINVAL);
 	}
+	VFS_UNLOCK_GIANT(vfslocked);
 	cred = td->td_ucred;
 	crhold(cred);
 
@@ -567,10 +563,8 @@
 	 */
 	audit_suspended = 0;
 
-	mtx_unlock(&Giant);
 	audit_rotate_vnode(cred, vp);
 
-err_out:
 	return (error);
 }