From owner-p4-projects@FreeBSD.ORG  Fri Sep 16 01:35:14 2005
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 8CE1516A421; Fri, 16 Sep 2005 01:35:13 +0000 (GMT)
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 586A216A41F
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 01:35:12 +0000 (GMT)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F29A343D45
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 01:35:11 +0000 (GMT)
	(envelope-from csjp@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 j8G1ZBW5043476
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 01:35:11 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8G1ZBvR043473
	for perforce@freebsd.org; Fri, 16 Sep 2005 01:35:11 GMT
	(envelope-from csjp@freebsd.org)
Date: Fri, 16 Sep 2005 01:35:11 GMT
Message-Id: <200509160135.j8G1ZBvR043473@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 83723 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, 16 Sep 2005 01:35:14 -0000

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

Change 83723 by csjp@csjp_xor on 2005/09/16 01:34:15

	Conditionally pickup giant if the filesystem is not marked as being
	MPsafe. This incorporates the new world order of VFS locking.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_chkexec/mac_chkexec.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_chkexec/mac_chkexec.c#15 (text+ko) ====

@@ -507,7 +507,7 @@
 {
 	struct nameidata nd;
 	char *depends, *ap;
-	int alen, error;
+	int vfslocked, alen, error;
 	size_t ealen;
 
 	ASSERT_VOP_LOCKED(vp, "no vlock held");
@@ -531,18 +531,17 @@
 	for (; (ap = strsep(&depends, ":")) != NULL && error == 0;) {
 		if (strlen(ap) == 0)
 			continue;
-		mtx_lock(&Giant);
-		NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_SYSSPACE,
+		NDINIT(&nd, LOOKUP, MPSAFE | LOCKLEAF | FOLLOW, UIO_SYSSPACE,
 		    ap, curthread);
 		if ((error = namei(&nd)) != 0) {
 			free(depends, M_CHKEXEC);
-			mtx_unlock(&Giant);
 			return (error);
 		}
+		vfslocked = NDHASGIANT(&nd);
 		error = mac_chkexec_check(nd.ni_vp, cred);
 		NDFREE(&nd, NDF_ONLY_PNBUF);
 		vput(nd.ni_vp);
-		mtx_unlock(&Giant);
+		VFS_UNLOCK_GIANT(vfslocked);
 	}
 	free(depends, M_CHKEXEC);
 	return (error);
@@ -813,7 +812,7 @@
 {
 	u_char digest[MAXCSUMSIZE];
 	struct nameidata nd;
-	int error;
+	int vfslocked, error;
 	struct hash_algo *ha;
 	struct mac_vcsum vcsum; 
 
@@ -839,18 +838,16 @@
 		CTR0(KTR_MAC, "mac_chkexec_check: invalid checksum algorithm");
 		return (EPERM);
 	}
-	/* XXX MPSAFE VFS */
-	mtx_lock(&Giant);
-	NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, arg, td);
+	NDINIT(&nd, LOOKUP, MPSAFE | LOCKLEAF | FOLLOW, UIO_USERSPACE, arg, td);
 	if ((error = namei(&nd)) != 0) {
-		mtx_unlock(&Giant);
 		return (error);
 	}
+	vfslocked = NDHASGIANT(&nd);
 	error = ha->crypto_hash(nd.ni_vp, td->td_ucred, digest);
 	if (error) {
 		NDFREE(&nd, NDF_ONLY_PNBUF); 
 		vput(nd.ni_vp);
-		mtx_unlock(&Giant);
+		VFS_UNLOCK_GIANT(vfslocked);
 		return (error);
 	}
 	bzero(&vcsum, sizeof(vcsum));
@@ -859,7 +856,7 @@
 	error = mac_chkexec_set_vcsum(nd.ni_vp, &vcsum);
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	vput(nd.ni_vp);
-	mtx_unlock(&Giant);
+	VFS_UNLOCK_GIANT(vfslocked);
 	return (error);
 }