Commit 95c021d8 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Jiri Slaby

mnt: Fix fs_fully_visible to verify the root directory is visible

commit 7e96c1b0 upstream.

This fixes a dumb bug in fs_fully_visible that allows proc or sys to
be mounted if there is a bind mount of part of /proc/ or /sys/ visible.
Reported-by: default avatarEric Windisch <ewindisch@docker.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent e8ed8a03
...@@ -2940,6 +2940,12 @@ bool fs_fully_visible(struct file_system_type *type) ...@@ -2940,6 +2940,12 @@ bool fs_fully_visible(struct file_system_type *type)
if (mnt->mnt.mnt_sb->s_type != type) if (mnt->mnt.mnt_sb->s_type != type)
continue; continue;
/* This mount is not fully visible if it's root directory
* is not the root directory of the filesystem.
*/
if (mnt->mnt.mnt_root != mnt->mnt.mnt_sb->s_root)
continue;
/* This mount is not fully visible if there are any child mounts /* This mount is not fully visible if there are any child mounts
* that cover anything except for empty directories. * that cover anything except for empty directories.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment