Skip to content

Commit c28f922

Browse files
author
Al Viro
committed
clone_private_mnt(): make sure that caller has CAP_SYS_ADMIN in the right userns
What we want is to verify there is that clone won't expose something hidden by a mount we wouldn't be able to undo. "Wouldn't be able to undo" may be a result of MNT_LOCKED on a child, but it may also come from lacking admin rights in the userns of the namespace mount belongs to. clone_private_mnt() checks the former, but not the latter. There's a number of rather confusing CAP_SYS_ADMIN checks in various userns during the mount, especially with the new mount API; they serve different purposes and in case of clone_private_mnt() they usually, but not always end up covering the missing check mentioned above. Reviewed-by: Christian Brauner <brauner@kernel.org> Reported-by: "Orlando, Noah" <Noah.Orlando@deshaw.com> Fixes: 427215d ("ovl: prevent private clone if bind mount is not allowed") Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 7054674 commit c28f922

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

fs/namespace.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2510,6 +2510,9 @@ struct vfsmount *clone_private_mount(const struct path *path)
25102510
return ERR_PTR(-EINVAL);
25112511
}
25122512

2513+
if (!ns_capable(old_mnt->mnt_ns->user_ns, CAP_SYS_ADMIN))
2514+
return ERR_PTR(-EPERM);
2515+
25132516
if (__has_locked_children(old_mnt, path->dentry))
25142517
return ERR_PTR(-EINVAL);
25152518

0 commit comments

Comments
 (0)