From owner-p4-projects@FreeBSD.ORG  Thu Jul 18 22:19:01 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 597727CA; Thu, 18 Jul 2013 22:19:01 +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 1A6437C8
 for <perforce@freebsd.org>; Thu, 18 Jul 2013 22:19:01 +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 09380C40
 for <perforce@freebsd.org>; Thu, 18 Jul 2013 22:19:01 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6IMJ0sQ020571
 for <perforce@freebsd.org>; Thu, 18 Jul 2013 22:19:00 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 r6IMJ0JG020568
 for perforce@freebsd.org; Thu, 18 Jul 2013 22:19:00 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 18 Jul 2013 22:19:00 GMT
Message-Id: <201307182219.r6IMJ0JG020568@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 231268 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: Thu, 18 Jul 2013 22:19:01 -0000

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

Change 231268 by rwatson@rwatson_cinnamon on 2013/07/18 22:18:45

	When checking previous MAC checks from ffs_read(), let a successful
	call to mac_vnode_check_readdir() authorise, not just a successful
	call to mac_vnode_check_read(), as UFS readdir() falls through to
	VOP_READ().  This silences TESLA false positives spotted in readdir().

Affected files ...

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

Differences ...

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

@@ -439,9 +439,11 @@
 
 	vp = ap->a_vp;
 	TESLA_SYSCALL(previously(mac_vnode_check_read(ANY(ptr), ANY(ptr), vp)
-	    == 0));
+	    == 0) ||
+	    previously(mac_vnode_check_readdir(ANY(ptr), vp) == 0));
 	TESLA_PAGE_FAULT(previously(mac_vnode_check_read(ANY(ptr), ANY(ptr),
-	    vp) == 0));
+	    vp) == 0) ||
+	    previously(mac_vnode_check_readdir(ANY(ptr), vp) == 0));
 
 	uio = ap->a_uio;
 	ioflag = ap->a_ioflag;