diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2016-05-27 14:50:05 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-06-18 11:59:15 -0400 |
| commit | f530dd0176f24aa31dd76672777de06f735d7bdc (patch) | |
| tree | a4acd820463e158307489fbae8a7aab67b113df7 | |
| parent | fced2a819164c305544bcc8d9a45beea15374528 (diff) | |
| download | linux-stable-f530dd0176f24aa31dd76672777de06f735d7bdc.tar.gz linux-stable-f530dd0176f24aa31dd76672777de06f735d7bdc.tar.bz2 linux-stable-f530dd0176f24aa31dd76672777de06f735d7bdc.zip | |
mnt: fs_fully_visible test the proper mount for MNT_LOCKED
[ 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>
| -rw-r--r-- | fs/namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 2b801290b286..6257268147ee 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -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)) |