|
@@ -205,7 +205,7 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)
|
|
|
* Check if an acl is valid. Returns 0 if it is, or -E... otherwise.
|
|
|
*/
|
|
|
int
|
|
|
-posix_acl_valid(const struct posix_acl *acl)
|
|
|
+posix_acl_valid(struct user_namespace *user_ns, const struct posix_acl *acl)
|
|
|
{
|
|
|
const struct posix_acl_entry *pa, *pe;
|
|
|
int state = ACL_USER_OBJ;
|
|
@@ -225,7 +225,7 @@ posix_acl_valid(const struct posix_acl *acl)
|
|
|
case ACL_USER:
|
|
|
if (state != ACL_USER)
|
|
|
return -EINVAL;
|
|
|
- if (!uid_valid(pa->e_uid))
|
|
|
+ if (!kuid_has_mapping(user_ns, pa->e_uid))
|
|
|
return -EINVAL;
|
|
|
needs_mask = 1;
|
|
|
break;
|
|
@@ -240,7 +240,7 @@ posix_acl_valid(const struct posix_acl *acl)
|
|
|
case ACL_GROUP:
|
|
|
if (state != ACL_GROUP)
|
|
|
return -EINVAL;
|
|
|
- if (!gid_valid(pa->e_gid))
|
|
|
+ if (!kgid_has_mapping(user_ns, pa->e_gid))
|
|
|
return -EINVAL;
|
|
|
needs_mask = 1;
|
|
|
break;
|
|
@@ -845,7 +845,7 @@ posix_acl_xattr_set(const struct xattr_handler *handler,
|
|
|
return PTR_ERR(acl);
|
|
|
|
|
|
if (acl) {
|
|
|
- ret = posix_acl_valid(acl);
|
|
|
+ ret = posix_acl_valid(inode->i_sb->s_user_ns, acl);
|
|
|
if (ret)
|
|
|
goto out;
|
|
|
}
|