From owner-p4-projects  Sun Jul 28 19:44:43 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AD14B37B401; Sun, 28 Jul 2002 19:44:37 -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 60C7837B400
	for <perforce@freebsd.org>; Sun, 28 Jul 2002 19:44:37 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1DB9F43E5E
	for <perforce@freebsd.org>; Sun, 28 Jul 2002 19:44:37 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.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 g6T2iaJU043911
	for <perforce@freebsd.org>; Sun, 28 Jul 2002 19:44:37 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T2iaUu043908
	for perforce@freebsd.org; Sun, 28 Jul 2002 19:44:36 -0700 (PDT)
Date: Sun, 28 Jul 2002 19:44:36 -0700 (PDT)
Message-Id: <200207290244.g6T2iaUu043908@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 15093 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=15093

Change 15093 by rwatson@rwatson_paprika on 2002/07/28 19:44:30

	Move vnode_op check to join the rest of the access control check
	entry points.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#212 edit

Differences ...

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

@@ -1858,6 +1858,25 @@
 }
 
 int
+mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op)
+{
+	int error;
+
+	if (!mac_enforce_fs)
+		return (0);
+
+	ASSERT_VOP_LOCKED(vp, "mac_check_vnode_op");
+
+	error = vn_refreshlabel(vp, cred);
+	if (error)
+		return (error);
+
+	MAC_CHECK(check_vnode_op, cred, vp, &vp->v_label, op);
+
+	return (error);
+}
+
+int
 mac_check_vnode_open(struct ucred *cred, struct vnode *vp, mode_t acc_mode)
 {
 	int error;
@@ -2674,25 +2693,6 @@
 }
 
 int
-mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op)
-{
-	int error;
-
-	if (!mac_enforce_fs)
-		return (0);
-
-	ASSERT_VOP_LOCKED(vp, "mac_check_vnode_op");
-
-	error = vn_refreshlabel(vp, cred);
-	if (error)
-		return (error);
-
-	MAC_CHECK(check_vnode_op, cred, vp, &vp->v_label, op);
-
-	return (error);
-}
-
-int
 mac_setsockopt_label_set(struct ucred *cred, struct socket *so,
     struct mac *extmac)
 {

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