From owner-p4-projects@FreeBSD.ORG  Mon Mar 18 16:00:22 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id E39B3240; Mon, 18 Mar 2013 16:00:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6AB6116C
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 16:00:21 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 56A2A67A
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 16:00:21 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2IG0Lv0009892
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 16:00:21 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2IG0Kio009889
 for perforce@freebsd.org; Mon, 18 Mar 2013 16:00:20 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 18 Mar 2013 16:00:20 GMT
Message-Id: <201303181600.r2IG0Kio009889@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 223013 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Mar 2013 16:00:22 -0000

http://p4web.freebsd.org/@@223013?ac=10

Change 223013 by rwatson@rwatson_cinnamon on 2013/03/18 16:00:18

	Add a second TESLA assertion relating to MAC enforcement on vnode
	operations.  Modify the existing assertion to use 'vp' instead of
	'ap->a_vp' as currently only variables, not more complex
	expressions, are permitted.  Would be useful to fix this.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#3 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#3 (text+ko) ====

@@ -408,7 +408,15 @@
 #endif
 }
 
+#ifdef TESLA
 /*
+ * XXXRW: It would be nice if we didn't have to do this.
+ */
+#include <security/mac/mac_framework.h>
+void	trap(struct trapframe *frame);
+#endif
+
+/*
  * Vnode op for reading.
  */
 static int
@@ -434,6 +442,9 @@
 	int ioflag;
 
 	vp = ap->a_vp;
+	TESLA_WITHIN(trap, previously(mac_vnode_check_read(ANY(ptr), ANY(ptr),
+	    vp) == 0));
+
 	uio = ap->a_uio;
 	ioflag = ap->a_ioflag;
 	if (ap->a_ioflag & IO_EXT)
@@ -646,10 +657,10 @@
 	int seqcount;
 	int blkoffset, error, flags, ioflag, size, xfersize;
 
-	TESLA_WITHIN(trap, previously(mac_check_vnode_write(ANY(ptr), ANY(ptr),
-	    ap->a_vp)));
+	vp = ap->a_vp;
+	TESLA_WITHIN(trap, previously(mac_vnode_check_write(ANY(ptr),
+	    ANY(ptr), vp) == 0));
 
-	vp = ap->a_vp;
 	uio = ap->a_uio;
 	ioflag = ap->a_ioflag;
 	if (ap->a_ioflag & IO_EXT)