diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-05-08 16:36:50 -0500 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2015-05-16 09:12:43 +0200 |
commit | 95c021d8b720eb3ade60e98b593f38a47df039fb (patch) | |
tree | f3a9686f104353c25dcd7d216427d06184cfad2f | |
parent | e8ed8a03c3526f0932ac5dc085a2d52644a18651 (diff) |
mnt: Fix fs_fully_visible to verify the root directory is visible
commit 7e96c1b0e0f495c5a7450dc4aa7c9a24ba4305bd 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: Eric Windisch <ewindisch@docker.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r-- | fs/namespace.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 7c3c0f6d2744..247f34d43dda 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2940,6 +2940,12 @@ bool fs_fully_visible(struct file_system_type *type) if (mnt->mnt.mnt_sb->s_type != type) 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 * that cover anything except for empty directories. */ |