]> git.hungrycats.org Git - linux/commitdiff
mnt: fs_fully_visible test the proper mount for MNT_LOCKED
authorEric W. Biederman <ebiederm@xmission.com>
Fri, 27 May 2016 19:50:05 +0000 (14:50 -0500)
committerSasha Levin <sasha.levin@oracle.com>
Sat, 18 Jun 2016 15:59:15 +0000 (11:59 -0400)
[ Upstream commit d71ed6c930ac7d8f88f3cef6624a7e826392d61f ]

MNT_LOCKED implies on a child mount implies the child is locked to the
parent.  So while looping through the children the children should be
tested (not their parent).

Typically an unshare of a mount namespace locks all mounts together
making both the parent and the slave as locked but there are a few
corner cases where other things work.

Cc: stable@vger.kernel.org
Fixes: ceeb0e5d39fc ("vfs: Ignore unlocked mounts in fs_fully_visible")
Reported-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
fs/namespace.c

index 2b801290b28623c66bb8e477972992d20fe8262c..6257268147ee19430664dd6319ba335249203fca 100644 (file)
@@ -3238,7 +3238,7 @@ static bool fs_fully_visible(struct file_system_type *type, int *new_mnt_flags)
                list_for_each_entry(child, &mnt->mnt_mounts, mnt_child) {
                        struct inode *inode = child->mnt_mountpoint->d_inode;
                        /* Only worry about locked mounts */
-                       if (!(mnt->mnt.mnt_flags & MNT_LOCKED))
+                       if (!(child->mnt.mnt_flags & MNT_LOCKED))
                                continue;
                        /* Is the directory permanetly empty? */
                        if (!is_empty_dir_inode(inode))