From owner-p4-projects  Sun Jul 21 12:29:44 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4CC5C37B401; Sun, 21 Jul 2002 12:29:40 -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 E3DBC37B400
	for <perforce@freebsd.org>; Sun, 21 Jul 2002 12:29:39 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7F7BF43E5E
	for <perforce@freebsd.org>; Sun, 21 Jul 2002 12:29:39 -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 g6LJTdJU093844
	for <perforce@freebsd.org>; Sun, 21 Jul 2002 12:29:39 -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 g6LJTdT6093841
	for perforce@freebsd.org; Sun, 21 Jul 2002 12:29:39 -0700 (PDT)
Date: Sun, 21 Jul 2002 12:29:39 -0700 (PDT)
Message-Id: <200207211929.g6LJTdT6093841@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 14623 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=14623

Change 14623 by rwatson@rwatson_curry on 2002/07/21 12:29:01

	Teach SVR4 fd_revoke() implementation about MAC.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#6 (text+ko) ====

@@ -30,12 +30,16 @@
  * 
  * $FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.23 2002/04/01 21:30:30 jhb Exp $
  */
+
+#include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 /*#include <sys/ioctl.h>*/
 #include <sys/lock.h>
+#include <sys/mac.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
@@ -260,6 +264,14 @@
 		goto out;
 	}
 
+#ifdef MAC
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	error = mac_cred_check_revoke_vnode(td->td_ucred, vp);
+	VOP_UNLOCK(vp, 0, td);
+	if (error)
+		goto out;
+#endif
+
 	if ((error = VOP_GETATTR(vp, &vattr, td->td_ucred, td)) != 0)
 		goto out;
 

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