Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Jul 2013 09:20:13 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 231319 for review
Message-ID:  <201307210920.r6L9KDTk055580@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307210920.r6L9KDTk055580>