From owner-p4-projects  Wed Jul 31 14:31:37 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 31FFA37B401; Wed, 31 Jul 2002 14:31:32 -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 C6DF837B400
	for <perforce@freebsd.org>; Wed, 31 Jul 2002 14:31:31 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 86F5C43E42
	for <perforce@freebsd.org>; Wed, 31 Jul 2002 14:31:31 -0700 (PDT)
	(envelope-from green@freebsd.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 g6VLVVJU053039
	for <perforce@freebsd.org>; Wed, 31 Jul 2002 14:31:31 -0700 (PDT)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VLVV8L053036
	for perforce@freebsd.org; Wed, 31 Jul 2002 14:31:31 -0700 (PDT)
Date: Wed, 31 Jul 2002 14:31:31 -0700 (PDT)
Message-Id: <200207312131.g6VLVV8L053036@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 15347 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://people.freebsd.org/~peter/p4db/chv.cgi?CH=15347

Change 15347 by green@green_laptop_2 on 2002/07/31 14:31:24

	mac_cred_canexec() no longer exists; use mac_check_vnode_exec().

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#28 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#28 (text+ko) ====

@@ -398,10 +398,12 @@
 	    attr.va_gid;
 
 #ifdef MAC
+	PROC_UNLOCK(p);
 	vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
 	will_transition = mac_execve_will_transition(oldcred, imgp->vp);
 	credential_changing |= will_transition;
 	VOP_UNLOCK(imgp->vp, 0, td);
+	PROC_LOCK(p);
 #endif
 
 	if (credential_changing &&
@@ -438,11 +440,13 @@
 			change_egid(newcred, attr.va_gid);
 #ifdef MAC
 		if (will_transition) {
+			PROC_UNLOCK(p);
 			vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
 			mac_execve_transition(oldcred, newcred, imgp->vp);
 			VOP_UNLOCK(imgp->vp, 0, td);
+			PROC_LOCK(p);
 		}
-#endif
+#endif /* MAC */
 		/*
 		 * Implement correct POSIX saved-id behavior.
 		 */

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