From owner-p4-projects Fri Oct 25 9:54:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF2A737B404; Fri, 25 Oct 2002 09:54:11 -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 4996237B401 for ; Fri, 25 Oct 2002 09:54:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D880C43E42 for ; Fri, 25 Oct 2002 09:54:10 -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 g9PGrLmV006817 for ; Fri, 25 Oct 2002 09:53:21 -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 g9PGrKHW006812 for perforce@freebsd.org; Fri, 25 Oct 2002 09:53:20 -0700 (PDT) Date: Fri, 25 Oct 2002 09:53:20 -0700 (PDT) Message-Id: <200210251653.g9PGrKHW006812@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 Subject: PERFORCE change 20130 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://perforce.freebsd.org/chv.cgi?CH=20130 Change 20130 by rwatson@rwatson_tislabs on 2002/10/25 09:52:42 For consistency, name mac_biba_privileged as mac_biba_subject_privileged -- it should only be called on subjects. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#160 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#160 (text+ko) ==== @@ -312,12 +312,12 @@ } static int -mac_biba_privileged(struct mac_biba *mac_biba) +mac_biba_subject_privileged(struct mac_biba *mac_biba) { KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAGS_BOTH) == MAC_BIBA_FLAGS_BOTH, - ("mac_biba_subject_equal_ok: subject doesn't have both labels")); + ("mac_biba_subject_privileged: subject doesn't have both labels")); /* If the single is EQUAL, it's ok. */ if (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_EQUAL) @@ -1480,7 +1480,7 @@ * their label. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); } @@ -1534,7 +1534,7 @@ /* * Relabling network interfaces requires Biba privilege. */ - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); @@ -1684,7 +1684,7 @@ * subject must have appropriate privilege. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); } @@ -1846,7 +1846,7 @@ * the subject must have appropriate privilege. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); } @@ -1899,7 +1899,7 @@ if (!mac_biba_subject_dominate_high(subj)) return (EACCES); - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); } @@ -2266,7 +2266,7 @@ * the subject must have appropriate privilege. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); } @@ -2484,7 +2484,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(label); - if (!mac_biba_privileged(subj)) + if (!mac_biba_subject_privileged(subj)) return (EPERM); if (!mac_biba_high_single(obj)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message