From owner-p4-projects  Thu Oct 24 13:44:18 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 94BEE37B404; Thu, 24 Oct 2002 13:44:15 -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 2DEC637B401
	for <perforce@freebsd.org>; Thu, 24 Oct 2002 13:44:15 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D9FB143E8A
	for <perforce@freebsd.org>; Thu, 24 Oct 2002 13:44:13 -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 g9OKhSmV028066
	for <perforce@freebsd.org>; Thu, 24 Oct 2002 13:43:28 -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 g9OKhRqt028063
	for perforce@freebsd.org; Thu, 24 Oct 2002 13:43:27 -0700 (PDT)
Date: Thu, 24 Oct 2002 13:43:27 -0700 (PDT)
Message-Id: <200210242043.g9OKhRqt028063@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 20077 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=20077

Change 20077 by rwatson@rwatson_tislabs on 2002/10/24 13:43:05

	A bit better pass at mprotect check -- not quite right yet,
	so leave it disabled, since we don't have a good cred.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#17 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#17 (text+ko) ====

@@ -1235,6 +1235,13 @@
 {
 	vm_map_entry_t current;
 	vm_map_entry_t entry;
+#ifdef MAC
+#if 0
+	vm_object_t object;
+	struct vnode *vp;
+	int error;
+#endif
+#endif
 
 	vm_map_lock(map);
 
@@ -1260,19 +1267,17 @@
 			return (KERN_PROTECTION_FAILURE);
 		}
 #ifdef MAC
-		/* XXXMAC: Checks against MAC labels should go here. */
 #if 0
 		/* Find the deepest backing object. */
-		vm_object_t object;
-		object = vme->object.vm_object;
+		object = current->object.vm_object;
 		while (object->backing_object != NULL)
 			object = object->backing_object;
 		switch (object->type) {
 		case OBJT_VNODE:
-			struct vnode *vp = (struct vnode *)object->handle;
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+			vp = (struct vnode *)object->handle;
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
 			error = mac_check_vnode_mprotect(cred, vp, new_prot);
-			VOP_UNLOCK(vp, 0, td);
+			VOP_UNLOCK(vp, 0, curthread);
 			if (error)
 				return (KERN_PROTECTION_FAILURE);
 			break;

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