From owner-p4-projects@FreeBSD.ORG  Thu May 29 12:57:09 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9F82837B404; Thu, 29 May 2003 12:57:08 -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 36DCC37B401
	for <perforce@freebsd.org>; Thu, 29 May 2003 12:57:08 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CEE3C43F75
	for <perforce@freebsd.org>; Thu, 29 May 2003 12:57:07 -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 h4TJv70U057345
	for <perforce@freebsd.org>; Thu, 29 May 2003 12:57:07 -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 h4TJv7pq057342
	for perforce@freebsd.org; Thu, 29 May 2003 12:57:07 -0700 (PDT)
Date: Thu, 29 May 2003 12:57:07 -0700 (PDT)
Message-Id: <200305291957.h4TJv7pq057342@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 32034 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, 29 May 2003 19:57:09 -0000

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

Change 32034 by rwatson@rwatson_tislabs on 2003/05/29 12:56:54

	At some point, the mac_biba compartment subset logic seems
	to have become inverted; return to logic wherein the Biba
	dominate logic for a>=b uses:
	
		a.grade >= b.grade
		a.compartment (superset) b.compartment
	
	This brings the _mac branch back into sync with the main
	FreeBSD tree; I couldn't find a description for the reason
	for this change, but if I missed it, please let me know.

Affected files ...

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

Differences ...

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

@@ -200,9 +200,9 @@
 
 		case MAC_BIBA_TYPE_GRADE:
 			for (bit = 1; bit <= MAC_BIBA_MAX_COMPARTMENTS; bit++)
-				if (MAC_BIBA_BIT_TEST(bit,
+				if (!MAC_BIBA_BIT_TEST(bit,
 				    a->mbe_compartments) &&
-				    !MAC_BIBA_BIT_TEST(bit,
+				    MAC_BIBA_BIT_TEST(bit,
 				    b->mbe_compartments))
 					return (0);
 			return (a->mbe_grade >= b->mbe_grade);