Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix user namespaces uid/gid mapping 

As described in torvalds/linux@5f3a4a2 the &init_user_ns, and
not the current user_ns, should be passed to posix_acl_from_xattr()
and posix_acl_to_xattr().  Conveniently the init_user_ns is
available through the init credential (kcred).


Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Massimo Maggi <me@massimo-maggi.eu>
Closes #4177
This commit is contained in:
Brian Behlendorf 2016-04-30 12:21:51 -07:00
parent 1ab3678b5d
commit 874bd959f4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/xattr_compat.h
View File

@ -190,20 +190,20 @@ fn(struct inode *ip, const char *name, const void *buffer, \
/* /*
* Linux 3.7 API change. posix_acl_{from,to}_xattr gained the user_ns * Linux 3.7 API change. posix_acl_{from,to}_xattr gained the user_ns
* parameter. For the HAVE_POSIX_ACL_FROM_XATTR_USERNS version the * parameter. All callers are expected to pass the &init_user_ns which
* userns _may_ not be correct because it's used outside the RCU. * is available through the init credential (kcred).
*/ */
#ifdef HAVE_POSIX_ACL_FROM_XATTR_USERNS #ifdef HAVE_POSIX_ACL_FROM_XATTR_USERNS
static inline struct posix_acl * static inline struct posix_acl *
zpl_acl_from_xattr(const void *value, int size) zpl_acl_from_xattr(const void *value, int size)
{ {
return (posix_acl_from_xattr(CRED()->user_ns, value, size)); return (posix_acl_from_xattr(kcred->user_ns, value, size));
} }
static inline int static inline int
zpl_acl_to_xattr(struct posix_acl *acl, void *value, int size) zpl_acl_to_xattr(struct posix_acl *acl, void *value, int size)
{ {
return (posix_acl_to_xattr(CRED()->user_ns, acl, value, size)); return (posix_acl_to_xattr(kcred->user_ns, acl, value, size));
} }
#else #else