aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-01-07 09:10:09 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-10 12:49:39 -0400
commitc89d4319ae55186496c43b7a6e510aa1d09dd387 (patch)
treed5e228e33a78cd0cd00ca5b65c9df5dcfffa9e15 /fs
parent1eda16d166170124b56e4090075ce6997c3d43af (diff)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/namespace.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 1b9e11167bae..1d4a97c573e0 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -3185,11 +3185,15 @@ bool fs_fully_visible(struct file_system_type *type)
3185 if (mnt->mnt.mnt_root != mnt->mnt.mnt_sb->s_root) 3185 if (mnt->mnt.mnt_root != mnt->mnt.mnt_sb->s_root)
3186 continue; 3186 continue;
3187 3187
3188 /* This mount is not fully visible if there are any child mounts 3188 /* This mount is not fully visible if there are any
3189 * that cover anything except for empty directories. 3189 * locked child mounts that cover anything except for
3190 * empty directories.
3190 */ 3191 */
3191 list_for_each_entry(child, &mnt->mnt_mounts, mnt_child) { 3192 list_for_each_entry(child, &mnt->mnt_mounts, mnt_child) {
3192 struct inode *inode = child->mnt_mountpoint->d_inode; 3193 struct inode *inode = child->mnt_mountpoint->d_inode;
3194 /* Only worry about locked mounts */
3195 if (!(mnt->mnt.mnt_flags & MNT_LOCKED))
3196 continue;
3193 if (!S_ISDIR(inode->i_mode)) 3197 if (!S_ISDIR(inode->i_mode))
3194 goto next; 3198 goto next;
3195 if (inode->i_nlink > 2) 3199 if (inode->i_nlink > 2)