[patch] Proposed patch

zfs-kmod-0.6.0_rc14-fix-hardened-support-regression.patch (text/plain), 1.59 KB, created by Richard Yao (RETIRED) on 2013-02-15 01:06:34 UTC

commit 9c6b3c2d08fdc9f9e27dd290d842e3a77e320c68
Author: Richard Yao <[e-mail]>
Date:   Thu Feb 14 18:54:04 2013 -0500

    Fix PaX/GrSecurity runtime error regression
    
    Commit 8780c53961e668211682d40ad36946294c3145d8 reintroduced an
    autotools check that is incompatible with the PaX/GrSecurity dialect of
    C. This caused autotools checks to exhibit silent failures that
    manifested as NULL pointer exceptions during runtime. A bug report
    involving this was submitted to the gentoo bug tracker:
    
    https://bugs.gentoo.org/show_bug.cgi?id=457176
    
    This patch adapts the dirty inode check reintroduced by commit
    8780c53961e668211682d40ad36946294c3145d8 to be semantically valid in the
    PaX/GrSecurity dialect of C.
    
    Reported-by: Marcin Mirosław <[e-mail]>
    Signed-off-by: Richard Yao <[e-mail]>

diff --git a/config/kernel-dirty-inode.m4 b/config/kernel-dirty-inode.m4
index 2ededf1..86e3425 100644
--- a/config/kernel-dirty-inode.m4
+++ b/config/kernel-dirty-inode.m4
@@ -8,11 +8,11 @@ AC_DEFUN([ZFS_AC_KERNEL_DIRTY_INODE_WITH_FLAGS], [
 	AC_MSG_CHECKING([whether sops->dirty_inode() wants flags])
 	ZFS_LINUX_TRY_COMPILE([
 		#include <linux/fs.h>
+		void dirty_inode (struct inode * a, int b) { return; }
+		static struct super_operations sops __attribute__ ((unused)) = {
+			.dirty_inode = dirty_inode,
+		};
 	],[
-		void (*dirty_inode) (struct inode *, int) = NULL;
-		struct super_operations sops __attribute__ ((unused));
-
-		sops.dirty_inode = dirty_inode;
 	],[
 		AC_MSG_RESULT([yes])
 		AC_DEFINE(HAVE_DIRTY_INODE_WITH_FLAGS, 1,