Fix NULL pointer dereference on PaX/GRSecurity patched Linux 3.3 and later kernels

[zfs.git] / config / kernel-show-options.m4

diff --git a/config/kernel-show-options.m4 b/config/kernel-show-options.m4
index 1bddb0a..67d683c 100644 (file)
--- a/config/kernel-show-options.m4
+++ b/config/kernel-show-options.m4
@@ -6,11 +6,12 @@ AC_DEFUN([ZFS_AC_KERNEL_SHOW_OPTIONS], [
 
        ZFS_LINUX_TRY_COMPILE([
                #include <linux/fs.h>
-       ],[
-               int (*show_options) (struct seq_file *, struct dentry *) = NULL;
-               struct super_operations sops __attribute__ ((unused));
 
-               sops.show_options = show_options;
+               int show_options (struct seq_file * x, struct dentry * y) { return 0; };
+               static struct super_operations sops __attribute__ ((unused)) = {
+                       .show_options = show_options,
+               };
+       ],[
        ],[
                AC_MSG_RESULT([yes])
                AC_DEFINE(HAVE_SHOW_OPTIONS_WITH_DENTRY, 1,