diff options
Diffstat (limited to 'fs/namespace.c')
-rw-r--r-- | fs/namespace.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 4fb1691b4355..a7ec92c051f5 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -2409,8 +2409,10 @@ static int do_new_mount(struct path *path, const char *fstype, int flags, | |||
2409 | mnt_flags |= MNT_NODEV | MNT_LOCK_NODEV; | 2409 | mnt_flags |= MNT_NODEV | MNT_LOCK_NODEV; |
2410 | } | 2410 | } |
2411 | if (type->fs_flags & FS_USERNS_VISIBLE) { | 2411 | if (type->fs_flags & FS_USERNS_VISIBLE) { |
2412 | if (!fs_fully_visible(type, &mnt_flags)) | 2412 | if (!fs_fully_visible(type, &mnt_flags)) { |
2413 | put_filesystem(type); | ||
2413 | return -EPERM; | 2414 | return -EPERM; |
2415 | } | ||
2414 | } | 2416 | } |
2415 | } | 2417 | } |
2416 | 2418 | ||
@@ -3271,7 +3273,7 @@ static bool fs_fully_visible(struct file_system_type *type, int *new_mnt_flags) | |||
3271 | list_for_each_entry(child, &mnt->mnt_mounts, mnt_child) { | 3273 | list_for_each_entry(child, &mnt->mnt_mounts, mnt_child) { |
3272 | struct inode *inode = child->mnt_mountpoint->d_inode; | 3274 | struct inode *inode = child->mnt_mountpoint->d_inode; |
3273 | /* Only worry about locked mounts */ | 3275 | /* Only worry about locked mounts */ |
3274 | if (!(mnt_flags & MNT_LOCKED)) | 3276 | if (!(child->mnt.mnt_flags & MNT_LOCKED)) |
3275 | continue; | 3277 | continue; |
3276 | /* Is the directory permanetly empty? */ | 3278 | /* Is the directory permanetly empty? */ |
3277 | if (!is_empty_dir_inode(inode)) | 3279 | if (!is_empty_dir_inode(inode)) |