From owner-svn-src-all@FreeBSD.ORG  Sat Oct  8 09:14:19 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 11E5B106564A;
	Sat,  8 Oct 2011 09:14:19 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 01A918FC0C;
	Sat,  8 Oct 2011 09:14:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p989EI6g051520;
	Sat, 8 Oct 2011 09:14:18 GMT (envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p989EIIn051518;
	Sat, 8 Oct 2011 09:14:18 GMT (envelope-from brueffer@svn.freebsd.org)
Message-Id: <201110080914.p989EIIn051518@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Sat, 8 Oct 2011 09:14:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226143 - head/sys/security/mac_mls
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Oct 2011 09:14:19 -0000

Author: brueffer
Date: Sat Oct  8 09:14:18 2011
New Revision: 226143
URL: http://svn.freebsd.org/changeset/base/226143

Log:
  Remove two dublicated assignments.
  
  CID:		9870
  Found with:	Coverity Prevent(tm)
  Confirmed by:	rwatson
  MFC after:	1 week

Modified:
  head/sys/security/mac_mls/mac_mls.c

Modified: head/sys/security/mac_mls/mac_mls.c
==============================================================================
--- head/sys/security/mac_mls/mac_mls.c	Sat Oct  8 09:06:43 2011	(r226142)
+++ head/sys/security/mac_mls/mac_mls.c	Sat Oct  8 09:14:18 2011	(r226143)
@@ -1636,9 +1636,6 @@ mls_posixshm_check_open(struct ucred *cr
 	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);