From owner-trustedbsd-cvs@FreeBSD.ORG Mon Dec 4 17:59:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8059616A40F for ; Mon, 4 Dec 2006 17:59:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF5A343C9D for ; Mon, 4 Dec 2006 17:59:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id A0A0846E9E for ; Mon, 4 Dec 2006 12:59:31 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id D47D157565; Mon, 4 Dec 2006 17:59:24 +0000 (GMT) (envelope-from owner-perforce@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 ; 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 ; 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 ; 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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 111033 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 17:59:36 -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 */