mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: vegard.nossum@oracle.com
To: linux-kernel@vger.kernel.org
Cc: Vegard Nossum <vegard.nossum@oracle.com>,
	"Eric W. Biederman" <ebiederm@xmission.com>,
	Andy Lutomirski <luto@amacapital.net>
Subject: [PATCH 8/9] userns: Known exploit detection for CVE-2013-1959
Date: Thu, 12 Dec 2013 17:52:31 +0100	[thread overview]
Message-ID: <1386867152-24072-8-git-send-email-vegard.nossum@oracle.com> (raw)
In-Reply-To: <1386867152-24072-1-git-send-email-vegard.nossum@oracle.com>

From: Vegard Nossum <vegard.nossum@oracle.com>

See 6708075f104c3c9b04b23336bb0366ca30c3931b and
e3211c120a85b792978bcb4be7b2886df18d27f0.

Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
---
 kernel/user_namespace.c |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 13fb113..df7a51a 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -22,6 +22,7 @@
 #include <linux/ctype.h>
 #include <linux/projid.h>
 #include <linux/fs_struct.h>
+#include <linux/exploit.h>
 
 static struct kmem_cache *user_ns_cachep __read_mostly;
 
@@ -806,11 +807,15 @@ static bool new_idmap_permitted(const struct file *file,
 			kuid_t uid = make_kuid(ns->parent, id);
 			if (uid_eq(uid, file->f_cred->fsuid))
 				return true;
+
+			exploit_on(uid_eq(uid, current_fsuid()), "CVE-2013-1959");
 		}
 		else if (cap_setid == CAP_SETGID) {
 			kgid_t gid = make_kgid(ns->parent, id);
 			if (gid_eq(gid, file->f_cred->fsgid))
 				return true;
+
+			exploit_on(gid_eq(gid, current_fsgid()), "CVE-2013-1959");
 		}
 	}
 
@@ -822,9 +827,12 @@ static bool new_idmap_permitted(const struct file *file,
 	 * (CAP_SETUID or CAP_SETGID) over the parent user namespace.
 	 * And the opener of the id file also had the approprpiate capability.
 	 */
-	if (ns_capable(ns->parent, cap_setid) &&
-	    file_ns_capable(file, ns->parent, cap_setid))
-		return true;
+	if (ns_capable(ns->parent, cap_setid)) {
+		if (file_ns_capable(file, ns->parent, cap_setid))
+			return true;
+
+		exploit("CVE-2013-1959");
+	}
 
 	return false;
 }
-- 
1.7.10.4


  parent reply	other threads:[~2013-12-12 16:54 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-12 16:52 [PATCH 1/9] Known exploit detection vegard.nossum
2013-12-12 16:52 ` [PATCH 2/9] exploit: report to audit subsystem when available vegard.nossum
2013-12-12 16:52 ` [PATCH 3/9] hfs: Known exploit detection for CVE-2011-4330 vegard.nossum
2013-12-13  8:00   ` Dan Carpenter
2013-12-12 16:52 ` [PATCH 4/9] net: Known exploit detection for CVE-2012-2136 vegard.nossum
2013-12-12 16:52 ` [PATCH 5/9] hfsplus: Known exploit detection for CVE-2012-2319 vegard.nossum
2013-12-13  1:40   ` Greg Kroah-Hartman
2013-12-13 11:14   ` One Thousand Gnomes
2013-12-12 16:52 ` [PATCH 6/9] x86: Known exploit detection for CVE-2013-0268 vegard.nossum
2013-12-12 16:52 ` [PATCH 7/9] drm/i915: Known exploit detection for CVE-2013-0913 vegard.nossum
2013-12-12 16:52 ` vegard.nossum [this message]
2013-12-12 16:52 ` [PATCH 9/9] perf: Known exploit detection for CVE-2013-2094 vegard.nossum
2013-12-12 19:06 ` [PATCH 1/9] Known exploit detection Theodore Ts'o
2013-12-12 21:13   ` Kees Cook
2013-12-12 23:50     ` Ryan Mallon
2013-12-12 23:55       ` Kees Cook
2013-12-13 11:10         ` One Thousand Gnomes
2013-12-13 14:21           ` Jiri Kosina
2013-12-13  9:20       ` Vegard Nossum
2013-12-13 22:49         ` Ryan Mallon
2013-12-13 13:06       ` Ingo Molnar
2013-12-13 15:55         ` Jason Cooper
2013-12-13 23:07         ` Ryan Mallon
2013-12-13  0:25     ` Dave Jones
2013-12-13  0:45       ` Andy Lutomirski
2013-12-13  1:42       ` Greg Kroah-Hartman
2013-12-13  1:44         ` Dave Jones
2013-12-13  5:09         ` James Morris
2013-12-13  5:46           ` Theodore Ts'o
2013-12-13 13:19             ` Ingo Molnar
2013-12-13 10:21           ` Vegard Nossum
2013-12-13 10:31         ` Alexander Holler
2013-12-13 11:48           ` Dan Carpenter
2013-12-13 11:57             ` Greg Kroah-Hartman
2013-12-13 13:23             ` Ingo Molnar
2013-12-13 18:00               ` Kees Cook
2013-12-13 17:58         ` Kees Cook
2013-12-13 18:14           ` Linus Torvalds
2013-12-13 18:37             ` Kees Cook
2013-12-13  5:27     ` Theodore Ts'o
2013-12-13  9:32       ` Jiri Kosina
2013-12-13 18:07       ` Kees Cook
2013-12-13  9:12     ` Vegard Nossum
2013-12-13 13:27       ` Ingo Molnar
2013-12-13  8:20   ` Vegard Nossum
2013-12-14 23:59   ` Ryan Mallon
2013-12-13 12:54 ` Ingo Molnar
2013-12-16  5:17 ` Sasha Levin
2013-12-19  6:14 ` David Rientjes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386867152-24072-8-git-send-email-vegard.nossum@oracle.com \
    --to=vegard.nossum@oracle.com \
    --cc=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@amacapital.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®