From owner-p4-projects@FreeBSD.ORG  Sat Oct  8 10:52:31 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 150341065673; Sat,  8 Oct 2011 10:52:31 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CBBB9106566C
	for <perforce@FreeBSD.org>; Sat,  8 Oct 2011 10:52:30 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 8159F8FC13
	for <perforce@FreeBSD.org>; Sat,  8 Oct 2011 10:52:30 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p98AqU5I056121
	for <perforce@FreeBSD.org>; Sat, 8 Oct 2011 10:52:30 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p98AqUkg056118
	for perforce@freebsd.org; Sat, 8 Oct 2011 10:52:30 GMT
	(envelope-from lz@FreeBSD.org)
Date: Sat, 8 Oct 2011 10:52:30 GMT
Message-Id: <201110081052.p98AqUkg056118@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu <lz@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 199901 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 08 Oct 2011 10:52:31 -0000

http://p4web.freebsd.org/@@199901?ac=10

Change 199901 by lz@freebsd-dev on 2011/10/08 10:52:25

	IFC.

Affected files ...

.. //depot/projects/soc2010/extfs/security/mac_mls/mac_mls.c#3 integrate

Differences ...

==== //depot/projects/soc2010/extfs/security/mac_mls/mac_mls.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.115 2011/09/02 17:40:39 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.116 2011/10/08 09:14:18 brueffer Exp $
  */
 
 /*
@@ -1636,9 +1636,6 @@
 	subj = SLOT(cred->cr_label);
 	obj = SLOT(shmlabel);
 
-	subj = SLOT(cred->cr_label);
-	obj = SLOT(shmlabel);
-
 	if (accmode & (VREAD | VEXEC | VSTAT_PERMS)) {
 		if (!mls_dominate_effective(subj, obj))
 			return (EACCES);