From owner-p4-projects  Wed Oct 23  8:40:16 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 05FFF37B404; Wed, 23 Oct 2002 08:40:13 -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 9731F37B401
	for <perforce@freebsd.org>; Wed, 23 Oct 2002 08:40:12 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4EA0E43E42
	for <perforce@freebsd.org>; Wed, 23 Oct 2002 08:40:12 -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 g9NFdWmV008596
	for <perforce@freebsd.org>; Wed, 23 Oct 2002 08:39:32 -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 g9NFdWgq008590
	for perforce@freebsd.org; Wed, 23 Oct 2002 08:39:32 -0700 (PDT)
Date: Wed, 23 Oct 2002 08:39:32 -0700 (PDT)
Message-Id: <200210231539.g9NFdWgq008590@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>
Subject: PERFORCE change 19968 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 19968 by rwatson@rwatson_tislabs on 2002/10/23 08:39:25

	Integ mac_biba sysctl change into mac_lomac.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#14 integrate

Differences ...

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

@@ -305,6 +305,14 @@
 }
 
 static int
+mac_lomac_privileged(struct mac_lomac *mac_lomac)
+{
+
+	/* Equate the notion of "equal" with privilege. */
+	return (mac_lomac_subject_equal_ok(mac_lomac));
+}
+
+static int
 mac_lomac_valid(struct mac_lomac *mac_lomac)
 {
 
@@ -1763,6 +1771,29 @@
 }
 
 static int
+mac_lomac_check_sysctl(struct ucred *cred, int *name, u_int namelen,
+    void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen)
+{
+	struct mac_lomac *subj;
+
+	if (!mac_lomac_enabled)
+		return (0);
+
+	subj = SLOT(&cred->cr_label);
+
+	/*
+	 * Permit sysctl modification only if Biba-privileged; permit
+	 * read by any process.
+	 */
+	if (new != NULL) {
+		if (!mac_lomac_privileged(subj))
+			return (EPERM);
+	}
+
+	return (0);
+}
+
+static int
 mac_lomac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp,
     struct label *dlabel)
 {
@@ -2559,6 +2590,8 @@
 	    (macop_t)mac_lomac_check_socket_relabel },
 	{ MAC_CHECK_SOCKET_VISIBLE,
 	    (macop_t)mac_lomac_check_socket_visible },
+	{ MAC_CHECK_SYSCTL,
+	    (macop_t)mac_lomac_check_sysctl },
 	{ MAC_CHECK_VNODE_ACCESS,
 	    (macop_t)mac_lomac_check_vnode_open },
 	{ MAC_CHECK_VNODE_CHDIR,

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message