Skip to content

Commit

Permalink
vfs: Ignore unlocked mounts in fs_fully_visible
Browse files Browse the repository at this point in the history
Limit the mounts fs_fully_visible considers to locked mounts.
Unlocked can always be unmounted so considering them adds hassle
but no security benefit.

Cc: stable@vger.kernel.org
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
  • Loading branch information
Eric W. Biederman committed Jul 1, 2015
1 parent 8c6cf9c commit ceeb0e5
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions fs/namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -3205,11 +3205,15 @@ static bool fs_fully_visible(struct file_system_type *type, int *new_mnt_flags)
((mnt->mnt.mnt_flags & MNT_ATIME_MASK) != (new_flags & MNT_ATIME_MASK)))
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)
Expand Down

0 comments on commit ceeb0e5

Please sign in to comment.