From owner-p4-projects@FreeBSD.ORG  Mon Dec  4 17:59:30 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 5337A16A412; Mon,  4 Dec 2006 17:59:30 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 303F316A407
	for <perforce@freebsd.org>; Mon,  4 Dec 2006 17:59:30 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E330E43CA7
	for <perforce@freebsd.org>; Mon,  4 Dec 2006 17:58:55 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4HxTXW081538
	for <perforce@freebsd.org>; Mon, 4 Dec 2006 17:59:29 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4HxTt3081535
	for perforce@freebsd.org; Mon, 4 Dec 2006 17:59:29 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 4 Dec 2006 17:59:29 GMT
Message-Id: <200612041759.kB4HxTt3081535@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111033 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, 04 Dec 2006 17:59:30 -0000

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

Change 111033 by millert@millert_g5tower on 2006/12/04 17:59:04

	Be sure to label aliased vnodes too.
	
	The vnode created by bdevvp() has no label and when
	checkalias() in vnode_create() returns that vnode for devfs
	to use, we failed to call mac_vnode_label_associate_singlelabel()

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_subr.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_subr.c#9 (text+ko) ====

@@ -3678,15 +3678,14 @@
 			if (param->vnfs_mp) {
 					if (param->vnfs_mp->mnt_kern_flag & MNTK_LOCK_LOCAL)
 						vp->v_flag |= VLOCKLOCAL;
-			        if (insert) {
 #ifdef MAC
-					if ((vfs_flags(param->vnfs_mp) & MNT_MULTILABEL) == 0) {
-						/* No locks or references needed */
-						mac_vnode_label_associate_singlelabel(param->vnfs_mp, vp);
-						vp->v_lflag |= VL_LABELED;
-					}
+				if ((vfs_flags(param->vnfs_mp) & MNT_MULTILABEL) == 0) {
+					/* No locks or references needed */
+					mac_vnode_label_associate_singlelabel(param->vnfs_mp, vp);
+					vp->v_lflag |= VL_LABELED;
+				}
 #endif
-
+			        if (insert) {
 				        /*
 					 * enter in mount vnode list
 					 */