From 39a78fe9d47ff76f89427125278143af525614e9 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 2 Aug 2016 11:11:45 -0700 Subject: [PATCH] Linux 4.8 compat: posix_acl_valid() The posix_acl_valid() function has been updated to require a user namespace. Filesystem callers should normally provide the user_ns from the super block associcated with the ACL; the zpl_posix_acl_valid() wrapper has been added for this purpose. See https://github.com/torvalds/linux/commit/0d4d717f for complete details. Signed-off-by: Brian Behlendorf Signed-off-by: Nikolay Borisov Signed-off-by: Chunwei Chen Closes #4922 --- config/kernel-acl.m4 | 24 ++++++++++++++++++++++++ config/kernel.m4 | 1 + include/linux/vfs_compat.h | 12 ++++++++++++ module/zfs/zpl_xattr.c | 4 ++-- 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/config/kernel-acl.m4 b/config/kernel-acl.m4 index 43d19953e4..e6f2bf507b 100644 --- a/config/kernel-acl.m4 +++ b/config/kernel-acl.m4 @@ -96,6 +96,30 @@ AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T], [ ]) ]) +dnl # +dnl # 4.8 API change, +dnl # The function posix_acl_valid now must be passed a namespace. +dnl # +AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_VALID_WITH_NS], [ + AC_MSG_CHECKING([whether posix_acl_valid() wants user namespace]) + ZFS_LINUX_TRY_COMPILE([ + #include + #include + ],[ + struct user_namespace *user_ns = NULL; + const struct posix_acl *acl = NULL; + int error; + + error = posix_acl_valid(user_ns, acl); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_POSIX_ACL_VALID_WITH_NS, 1, + [posix_acl_valid() wants user namespace]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + dnl # dnl # 2.6.27 API change, dnl # Check if inode_operations contains the function permission diff --git a/config/kernel.m4 b/config/kernel.m4 index a9bf3e6f5b..71d6df0c20 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -42,6 +42,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_POSIX_ACL_RELEASE ZFS_AC_KERNEL_POSIX_ACL_CHMOD ZFS_AC_KERNEL_POSIX_ACL_EQUIV_MODE_WANTS_UMODE_T + ZFS_AC_KERNEL_POSIX_ACL_VALID_WITH_NS ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION ZFS_AC_KERNEL_INODE_OPERATIONS_PERMISSION_WITH_NAMEIDATA ZFS_AC_KERNEL_INODE_OPERATIONS_CHECK_ACL diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h index 4eac39dec2..b4881a6c67 100644 --- a/include/linux/vfs_compat.h +++ b/include/linux/vfs_compat.h @@ -315,6 +315,18 @@ typedef umode_t zpl_equivmode_t; #else typedef mode_t zpl_equivmode_t; #endif /* HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T */ + +/* + * 4.8 API change, + * posix_acl_valid() now must be passed a namespace, the namespace from + * from super block associated with the given inode is used for this purpose. + */ +#ifdef HAVE_POSIX_ACL_VALID_WITH_NS +#define zpl_posix_acl_valid(ip, acl) posix_acl_valid(ip->i_sb->s_user_ns, acl) +#else +#define zpl_posix_acl_valid(ip, acl) posix_acl_valid(acl) +#endif + #endif /* CONFIG_FS_POSIX_ACL */ /* diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c index fb1b61bd2a..f14dd1a525 100644 --- a/module/zfs/zpl_xattr.c +++ b/module/zfs/zpl_xattr.c @@ -1298,7 +1298,7 @@ __zpl_xattr_acl_set_access(struct inode *ip, const char *name, if (IS_ERR(acl)) return (PTR_ERR(acl)); else if (acl) { - error = posix_acl_valid(acl); + error = zpl_posix_acl_valid(ip, acl); if (error) { zpl_posix_acl_release(acl); return (error); @@ -1338,7 +1338,7 @@ __zpl_xattr_acl_set_default(struct inode *ip, const char *name, if (IS_ERR(acl)) return (PTR_ERR(acl)); else if (acl) { - error = posix_acl_valid(acl); + error = zpl_posix_acl_valid(ip, acl); if (error) { zpl_posix_acl_release(acl); return (error);