diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2016-05-27 14:50:05 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-27 09:47:28 -0700 |
| commit | 57eb6e3dbdd3389a4325b8d5a42203591f64153d (patch) | |
| tree | 34b719a9ff6da62f627fb79aebf844f2f11ca149 /fs/namespace.c | |
| parent | 67799eb4ab84ce94c44346af672246dc90c1a8ad (diff) | |
| download | lwn-57eb6e3dbdd3389a4325b8d5a42203591f64153d.tar.gz lwn-57eb6e3dbdd3389a4325b8d5a42203591f64153d.zip | |
mnt: fs_fully_visible test the proper mount for MNT_LOCKED
commit d71ed6c930ac7d8f88f3cef6624a7e826392d61f upstream.
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.
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/namespace.c')
| -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 0570729c87fd..efb396f41fcd 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -3262,7 +3262,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_flags & MNT_LOCKED)) + if (!(child->mnt.mnt_flags & MNT_LOCKED)) continue; /* Is the directory permanetly empty? */ if (!is_empty_dir_inode(inode)) |