aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/posix_acl.h
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2016-06-27 16:04:06 -0500
committerEric W. Biederman <ebiederm@xmission.com>2016-06-30 18:04:58 -0500
commit0d4d717f25834134bb6f43284f84c8ccee5bbf2a (patch)
treeaa4f4605f45bca718b01483e90835731227ef341 /include/linux/posix_acl.h
parentuserns: Handle -1 in k[ug]id_has_mapping when !CONFIG_USER_NS (diff)
downloadlinux-dev-0d4d717f25834134bb6f43284f84c8ccee5bbf2a.tar.xz
linux-dev-0d4d717f25834134bb6f43284f84c8ccee5bbf2a.zip
vfs: Verify acls are valid within superblock's s_user_ns.
Update posix_acl_valid to verify that an acl is within a user namespace. Update the callers of posix_acl_valid to pass in an appropriate user namespace. For posix_acl_xattr_set and v9fs_xattr_set_acl pass in inode->i_sb->s_user_ns to posix_acl_valid. For md_unpack_acl pass in &init_user_ns as no inode or superblock is in sight. Acked-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'include/linux/posix_acl.h')
-rw-r--r--include/linux/posix_acl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 5b5a80cc5926..1af6438fde3e 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -81,7 +81,7 @@ posix_acl_release(struct posix_acl *acl)
extern void posix_acl_init(struct posix_acl *, int);
extern struct posix_acl *posix_acl_alloc(int, gfp_t);
-extern int posix_acl_valid(const struct posix_acl *);
+extern int posix_acl_valid(struct user_namespace *, const struct posix_acl *);
extern int posix_acl_permission(struct inode *, const struct posix_acl *, int);
extern struct posix_acl *posix_acl_from_mode(umode_t, gfp_t);
extern int posix_acl_equiv_mode(const struct posix_acl *, umode_t *);