aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-12-05 19:26:30 -0500
committerEric W. Biederman <ebiederm@xmission.com>2014-12-09 18:08:32 -0500
commit80dd00a23784b384ccea049bfb3f259d3f973b9d (patch)
tree40ff3ad2233bc6f08bcde250acc87a29af9ad0af
parentbe7c6dba2332cef0677fbabb606e279ae76652c3 (diff)
userns: Check euid no fsuid when establishing an unprivileged uid mapping
setresuid allows the euid to be set to any of uid, euid, suid, and fsuid. Therefor it is safe to allow an unprivileged user to map their euid and use CAP_SETUID privileged with exactly that uid, as no new credentials can be obtained. I can not find a combination of existing system calls that allows setting uid, euid, suid, and fsuid from the fsuid making the previous use of fsuid for allowing unprivileged mappings a bug. This is part of a fix for CVE-2014-8989. Cc: stable@vger.kernel.org Reviewed-by: Andy Lutomirski <luto@amacapital.net> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r--kernel/user_namespace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 1ce6d67c07b7..9451b12a9b6c 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -819,7 +819,7 @@ static bool new_idmap_permitted(const struct file *file,
819 u32 id = new_map->extent[0].lower_first; 819 u32 id = new_map->extent[0].lower_first;
820 if (cap_setid == CAP_SETUID) { 820 if (cap_setid == CAP_SETUID) {
821 kuid_t uid = make_kuid(ns->parent, id); 821 kuid_t uid = make_kuid(ns->parent, id);
822 if (uid_eq(uid, file->f_cred->fsuid)) 822 if (uid_eq(uid, file->f_cred->euid))
823 return true; 823 return true;
824 } 824 }
825 } 825 }