From owner-p4-projects@FreeBSD.ORG  Mon Mar 18 10:41:47 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id CA1E8A5A; Mon, 18 Mar 2013 10:41:47 +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 88917A54
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 10:41:47 +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 725961AF
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 10:41:47 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2IAaPp7079037
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 10:36:25 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 r2IAaPC5079034
 for perforce@freebsd.org; Mon, 18 Mar 2013 10:36:25 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 18 Mar 2013 10:36:25 GMT
Message-Id: <201303181036.r2IAaPC5079034@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 223006 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 10:41:48 -0000

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

Change 223006 by rwatson@rwatson_cinnamon on 2013/03/18 10:36:13

	Trial "previously their was a MAC check" TESLA annotation for
	ffs_write().

Affected files ...

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

Differences ...

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

@@ -79,6 +79,9 @@
 #include <sys/vmmeter.h>
 #include <sys/vnode.h>
 
+#include <libtesla/tesla.h>
+#include <libtesla/tesla-macros.h>
+
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_extern.h>
@@ -643,6 +646,9 @@
 	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;
 	uio = ap->a_uio;
 	ioflag = ap->a_ioflag;