Revert "UBUNTU: SAUCE: aufs -- remove .readlink assignment"

[mirror_ubuntu-zesty-kernel.git] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index d9fc7617b9e48a9225f5a97a752ed3bd5db7b869..551a0af00019dc0d5d182577537c1822d09c7ece 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -37,7 +37,7 @@
 #include <linux/hash.h>
 #include <linux/bitops.h>
 #include <linux/init_task.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include "internal.h"
 #include "mount.h"
@@ -888,8 +888,8 @@ static inline void put_link(struct nameidata *nd)
                path_put(&last->link);
 }
 
-int sysctl_protected_symlinks __read_mostly = 0;
-int sysctl_protected_hardlinks __read_mostly = 0;
+int sysctl_protected_symlinks __read_mostly = 1;
+int sysctl_protected_hardlinks __read_mostly = 1;
 
 /**
  * may_follow_link - Check symlink following for unsafe situations