From owner-p4-projects  Tue Nov  5 10:35: 5 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 208CA37B406; Tue,  5 Nov 2002 10:35:02 -0800 (PST)
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 C34E237B404
	for <perforce@freebsd.org>; Tue,  5 Nov 2002 10:35:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6302743E77
	for <perforce@freebsd.org>; Tue,  5 Nov 2002 10:35:01 -0800 (PST)
	(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 gA5IXEmV049134
	for <perforce@freebsd.org>; Tue, 5 Nov 2002 10:33:14 -0800 (PST)
	(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 gA5IXEoA049131
	for perforce@freebsd.org; Tue, 5 Nov 2002 10:33:14 -0800 (PST)
Date: Tue, 5 Nov 2002 10:33:14 -0800 (PST)
Message-Id: <200211051833.gA5IXEoA049131@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 20711 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=20711

Change 20711 by rwatson@rwatson_tislabs on 2002/11/05 10:32:56

	Disallow changing labels at mac_exec()-time using MLS, since the
	machinery isn't in place yet.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#144 edit

Differences ...

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

@@ -1884,7 +1884,20 @@
     struct label *label, struct image_params *imgp,
     struct label *execlabel)
 {
-	struct mac_mls *subj, *obj;
+	struct mac_mls *subj, *obj, *exec;
+	int error;
+
+	if (execlabel != NULL) {
+		/*
+		 * We currently don't permit labels to be changed at
+		 * exec-time as part of MLS, so disallow non-NULL
+		 * MLS label elements in the execlabel.
+		 */
+		exec = SLOT(execlabel);
+		error = mls_atmostflags(exec, 0);
+		if (error)
+			return (error);
+	}
 
 	if (!mac_mls_enabled)
 		return (0);

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