From owner-p4-projects@FreeBSD.ORG  Thu Jul 31 10:48:36 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 53F5437B401; Thu, 31 Jul 2003 10:48:35 -0700 (PDT)
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 B1E6437B401
	for <perforce@freebsd.org>; Thu, 31 Jul 2003 10:48:33 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4F48243FA3
	for <perforce@freebsd.org>; Thu, 31 Jul 2003 10:48:33 -0700 (PDT)
	(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.6/8.12.6) with ESMTP id h6VHmX0U087907
	for <perforce@freebsd.org>; Thu, 31 Jul 2003 10:48:33 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6VHmW1g087904
	for perforce@freebsd.org; Thu, 31 Jul 2003 10:48:32 -0700 (PDT)
Date: Thu, 31 Jul 2003 10:48:32 -0700 (PDT)
Message-Id: <200307311748.h6VHmW1g087904@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 35273 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: Thu, 31 Jul 2003 17:48:37 -0000

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

Change 35273 by rwatson@rwatson_tislabs on 2003/07/31 10:48:05

	The MAC Framework does a suser check for interface relabeling
	already, so simply do a Biba privilege check to determine
	whether an interface relabel request is permitted.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#217 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#217 (text+ko) ====

@@ -1550,25 +1550,6 @@
 	if (error)
 		return (error);
 
-	/*
-	 * If the Biba label is to be changed, authorize as appropriate.
-	 */
-	if (new->mb_flags & MAC_BIBA_FLAGS_BOTH) {
-		/*
-		 * Rely on the traditional superuser status for the Biba
-		 * interface relabel requirements.  XXXMAC: This will go
-		 * away.
-		 */
-		error = suser_cred(cred, 0);
-		if (error)
-			return (EPERM);
-
-		/*
-		 * XXXMAC: Additional consistency tests regarding the single
-		 * and the range of the new label might be performed here.
-		 */
-	}
-
 	return (0);
 }