Merge tag 'v3.10.64' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / namespace.c

diff --git a/fs/namespace.c b/fs/namespace.c
index 44d4218a4a6affaa061b2b3da067ad13e82ee1af..a2c0b962e5d282993faf3a849278581df46a27e0 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1474,6 +1474,9 @@ SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
                goto dput_and_out;
        if (!check_mnt(mnt))
                goto dput_and_out;
+       retval = -EPERM;
+       if (flags & MNT_FORCE && !capable(CAP_SYS_ADMIN))
+               goto dput_and_out;
 
        retval = do_umount(mnt, flags);
 #ifdef UMOUNT_LOG
@@ -1974,7 +1977,13 @@ static int do_remount(struct path *path, int flags, int mnt_flags,
        }
        if ((mnt->mnt.mnt_flags & MNT_LOCK_NODEV) &&
            !(mnt_flags & MNT_NODEV)) {
-               return -EPERM;
+               /* Was the nodev implicitly added in mount? */
+               if ((mnt->mnt_ns->user_ns != &init_user_ns) &&
+                   !(sb->s_type->fs_flags & FS_USERNS_DEV_MOUNT)) {
+                       mnt_flags |= MNT_NODEV;
+               } else {
+                       return -EPERM;
+               }
        }
        if ((mnt->mnt.mnt_flags & MNT_LOCK_NOSUID) &&
            !(mnt_flags & MNT_NOSUID)) {