Skip to content

Commit

Permalink
Revert 95ebabd ("capabilities: Don't allow writing ambiguous v3 file …
Browse files Browse the repository at this point in the history
…capabilities")

It turns out that there are in fact userspace implementations that
care and this recent change caused a regression.

https://github.com/containers/buildah/issues/3071

As the motivation for the original change was future development,
and the impact is existing real world code just revert this change
and allow the ambiguity in v3 file caps.

Cc: stable@vger.kernel.org
Fixes: 95ebabd ("capabilities: Don't allow writing ambiguous v3 file capabilities")
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
  • Loading branch information
Eric W. Biederman committed Mar 12, 2021
1 parent a38fd87 commit 3b0c2d3
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions security/commoncap.c
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,7 @@ int cap_convert_nscap(struct user_namespace *mnt_userns, struct dentry *dentry,
__u32 magic, nsmagic;
struct inode *inode = d_backing_inode(dentry);
struct user_namespace *task_ns = current_user_ns(),
*fs_ns = inode->i_sb->s_user_ns,
*ancestor;
*fs_ns = inode->i_sb->s_user_ns;
kuid_t rootid;
size_t newsize;

Expand All @@ -567,15 +566,6 @@ int cap_convert_nscap(struct user_namespace *mnt_userns, struct dentry *dentry,
if (nsrootid == -1)
return -EINVAL;

/*
* Do not allow allow adding a v3 filesystem capability xattr
* if the rootid field is ambiguous.
*/
for (ancestor = task_ns->parent; ancestor; ancestor = ancestor->parent) {
if (from_kuid(ancestor, rootid) == 0)
return -EINVAL;
}

newsize = sizeof(struct vfs_ns_cap_data);
nscap = kmalloc(newsize, GFP_ATOMIC);
if (!nscap)
Expand Down

0 comments on commit 3b0c2d3

Please sign in to comment.