X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=fs%2Fnamespace.c;h=0730c16f6c673243608d20bd93d148cd55a921ca;hb=0815cfda63da56a2ca3c50e988e4a752593dd8f4;hp=487ba30bb5c67a8f66bdaadb5b13e8240c937f7a;hpb=0aa0313f9d576affd7747cc3f179feb097d28990;p=mirror_ubuntu-zesty-kernel.git

diff --git a/fs/namespace.c b/fs/namespace.c
index 487ba30bb5c6..0730c16f6c67 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1572,7 +1572,7 @@ static int do_umount(struct mount *mnt, int flags)
 		 * Special case for "unmounting" root ...
 		 * we just try to remount it readonly.
 		 */
-		if (!capable(CAP_SYS_ADMIN))
+		if (!ns_capable(sb->s_user_ns, CAP_SYS_ADMIN))
 			return -EPERM;
 		down_write(&sb->s_umount);
 		if (!(sb->s_flags & MS_RDONLY))
@@ -2302,7 +2302,7 @@ static int do_remount(struct path *path, int flags, int mnt_flags,
 	down_write(&sb->s_umount);
 	if (flags & MS_BIND)
 		err = change_mount_flags(path->mnt, flags);
-	else if (!capable(CAP_SYS_ADMIN))
+	else if (!ns_capable(sb->s_user_ns, CAP_SYS_ADMIN))
 		err = -EPERM;
 	else
 		err = do_remount_sb(sb, flags, data, 0);