diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-01-07 08:10:09 -0600 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-07-30 14:10:44 +0200 |
| commit | 5029d7e0b1f8fc45efdc6fad2dd688801476b505 (patch) | |
| tree | a048fc370bb9543b866d41e94d56476751a3b736 /fs/namespace.c | |
| parent | 4ac11cad23835c01bc6d871b4addf04bbc03d7aa (diff) | |
| download | linux-stable-5029d7e0b1f8fc45efdc6fad2dd688801476b505.tar.gz linux-stable-5029d7e0b1f8fc45efdc6fad2dd688801476b505.tar.bz2 linux-stable-5029d7e0b1f8fc45efdc6fad2dd688801476b505.zip | |
vfs: Ignore unlocked mounts in fs_fully_visible
commit ceeb0e5d39fcdf4dca2c997bf225c7fc49200b37 upstream.
Limit the mounts fs_fully_visible considers to locked mounts.
Unlocked can always be unmounted so considering them adds hassle
but no security benefit.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 9ae6837ef5bf..bdc6223a7500 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2939,11 +2939,15 @@ bool fs_fully_visible(struct file_system_type *type) if (mnt->mnt.mnt_root != mnt->mnt.mnt_sb->s_root) continue; - /* This mount is not fully visible if there are any child mounts - * that cover anything except for empty directories. + /* This mount is not fully visible if there are any + * locked child mounts that cover anything except for + * empty directories. */ 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)) + continue; if (!S_ISDIR(inode->i_mode)) goto next; if (inode->i_nlink > 2) |