From owner-p4-projects@FreeBSD.ORG  Wed Nov 12 14:12:01 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A943416A4D0; Wed, 12 Nov 2003 14:12:01 -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 8395416A4CE
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 14:12:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EABD443FAF
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 14:12:00 -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 hACMC0XJ026241
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 14:12:00 -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 hACMC0LO026235
	for perforce@freebsd.org; Wed, 12 Nov 2003 14:12:00 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 12 Nov 2003 14:12:00 -0800 (PST)
Message-Id: <200311122212.hACMC0LO026235@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 42170 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: Wed, 12 Nov 2003 22:12:02 -0000

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

Change 42170 by rwatson@rwatson_tislabs on 2003/11/12 14:11:05

	Slide MAC label allocations outside of Giant in system calls
	touching VFS.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#431 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#431 (text+ko) ====

@@ -752,15 +752,15 @@
 	case DTYPE_VNODE:
 		vp = fp->f_vnode;
 
+		intlabel = mac_vnode_label_alloc();
 		mtx_lock(&Giant);				/* VFS */
-		intlabel = mac_vnode_label_alloc();
 		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 		mac_copy_vnode_label(vp->v_label, intlabel);
 		VOP_UNLOCK(vp, 0, td);
 		error = mac_externalize_vnode_label(intlabel, elements,
 		    buffer, mac.m_buflen);
+		mtx_unlock(&Giant);				/* VFS */
 		mac_vnode_label_free(intlabel);
-		mtx_unlock(&Giant);				/* VFS */
 		break;
 	case DTYPE_PIPE:
 		pipe = fp->f_data;
@@ -951,8 +951,8 @@
 		error = vn_setlabel(vp, intlabel, td->td_ucred);
 		VOP_UNLOCK(vp, 0, td);
 		vn_finished_write(mp);
+		mtx_unlock(&Giant);				/* VFS */
 		mac_vnode_label_free(intlabel);
-		mtx_unlock(&Giant);				/* VFS */
 		break;
 
 	case DTYPE_PIPE: