From owner-p4-projects@FreeBSD.ORG  Sun Jul 21 09:20:14 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 7AE79255; Sun, 21 Jul 2013 09:20:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3AB6F253
 for <perforce@freebsd.org>; Sun, 21 Jul 2013 09:20:14 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 by mx1.freebsd.org (Postfix) with ESMTP id 2B3CADCC
 for <perforce@freebsd.org>; Sun, 21 Jul 2013 09:20:14 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6L9KEBb055583
 for <perforce@freebsd.org>; Sun, 21 Jul 2013 09:20:14 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6L9KDTk055580
 for perforce@freebsd.org; Sun, 21 Jul 2013 09:20:13 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 21 Jul 2013 09:20:13 GMT
Message-Id: <201307210920.r6L9KDTk055580@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 231319 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: Sun, 21 Jul 2013 09:20:14 -0000

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

Change 231319 by rwatson@rwatson_cinnamon on 2013/07/21 09:19:59

	Assert prior MAC checks for UFS read and write operations only if
	MAC is compiled into the kernel.

Affected files ...

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

Differences ...

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

@@ -438,12 +438,14 @@
 	int ioflag;
 
 	vp = ap->a_vp;
+#ifdef MAC
 	TESLA_SYSCALL(previously(mac_vnode_check_read(ANY(ptr), ANY(ptr), vp)
 	    == 0) ||
 	    previously(mac_vnode_check_readdir(ANY(ptr), vp) == 0));
 	TESLA_PAGE_FAULT(previously(mac_vnode_check_read(ANY(ptr), ANY(ptr),
 	    vp) == 0) ||
 	    previously(mac_vnode_check_readdir(ANY(ptr), vp) == 0));
+#endif
 
 	uio = ap->a_uio;
 	ioflag = ap->a_ioflag;
@@ -666,10 +668,12 @@
 	int blkoffset, error, flags, ioflag, size, xfersize;
 
 	vp = ap->a_vp;
+#ifdef MAC
 	TESLA_SYSCALL(previously(mac_vnode_check_write(ANY(ptr), ANY(ptr), vp)
 	    == 0));
 	TESLA_PAGE_FAULT(previously(mac_vnode_check_WRITE(ANY(ptr), ANY(ptr),
 	    vp) == 0));
+#endif
 
 	uio = ap->a_uio;
 	ioflag = ap->a_ioflag;