From owner-p4-projects Thu Jul 25 20: 8:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCA3537B401; Thu, 25 Jul 2002 20:08:20 -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 8F51037B400 for ; Thu, 25 Jul 2002 20:08:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AD5343E31 for ; Thu, 25 Jul 2002 20:08:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6Q38KJU096310 for ; Thu, 25 Jul 2002 20:08:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6Q38JS3096307 for perforce@freebsd.org; Thu, 25 Jul 2002 20:08:19 -0700 (PDT) Date: Thu, 25 Jul 2002 20:08:19 -0700 (PDT) Message-Id: <200207260308.g6Q38JS3096307@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14923 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14923 Change 14923 by rwatson@rwatson_curry on 2002/07/25 20:07:42 Sanity checking on label single/range comparison operations. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#71 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#59 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#71 (text+ko) ==== @@ -196,6 +196,11 @@ mac_biba_single_in_range(struct mac_biba *single, struct mac_biba *range) { + KASSERT((single->mb_flag & MAC_BIBA_FLAG_SINGLE) != 0, + ("mac_biba_single_in_range: a not single")); + KASSERT((range->mb_flag & MAC_BIBA_FLAG_RANGE) != 0, + ("mac_biba_single_in_range: b not range")); + return (mac_biba_dominate_element(&range->mb_rangehigh, &single->mb_single) && mac_biba_dominate_element(&single->mb_single, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#59 (text+ko) ==== @@ -181,6 +181,11 @@ mac_mls_single_in_range(struct mac_mls *single, struct mac_mls *range) { + KASSERT((single->mm_flag & MAC_MLS_FLAG_SINGLE) != 0, + ("mac_mls_single_in_range: a not single")); + KASSERT((range->mm_flag & MAC_MLS_FLAG_RANGE) != 0, + ("mac_mls_single_in_range: b not range")); + return (mac_mls_dominate_element(&range->mm_rangehigh, &single->mm_single) && mac_mls_dominate_element(&single->mm_single, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message