From 158ae68ccf4fb663b5bd50513c44df77342e7e41 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 4 May 2010 17:36:48 -0700
Subject: [PATCH] --- yaml --- r: 196069 b: refs/heads/master c:
 417daa1e8f893fbac88fd395340ba7779fd3926c h: refs/heads/master i:   196067:
 d39c5e758c82fa991b49014cce40ad1203256b0b v: v3

---
 [refs]                     |  2 +-
 trunk/lib/kobject_uevent.c | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 917af5a751f5..3a46d42753b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f71a29629b4717445f8b7f5fb8f50c2d262b68e
+refs/heads/master: 417daa1e8f893fbac88fd395340ba7779fd3926c
diff --git a/trunk/lib/kobject_uevent.c b/trunk/lib/kobject_uevent.c
index 239c8e83fc28..59c15511d58a 100644
--- a/trunk/lib/kobject_uevent.c
+++ b/trunk/lib/kobject_uevent.c
@@ -19,7 +19,7 @@
 #include <linux/kobject.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-
+#include <linux/user_namespace.h>
 #include <linux/socket.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
@@ -99,6 +99,21 @@ static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data)
 	return 0;
 }
 
+static int kobj_usermode_filter(struct kobject *kobj)
+{
+	const struct kobj_ns_type_operations *ops;
+
+	ops = kobj_ns_ops(kobj);
+	if (ops) {
+		const void *init_ns, *ns;
+		ns = kobj->ktype->namespace(kobj);
+		init_ns = ops->initial_ns();
+		return ns != init_ns;
+	}
+
+	return 0;
+}
+
 /**
  * kobject_uevent_env - send an uevent with environmental data
  *
@@ -274,7 +289,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
 #endif
 
 	/* call uevent_helper, usually only enabled during early boot */
-	if (uevent_helper[0]) {
+	if (uevent_helper[0] && !kobj_usermode_filter(kobj)) {
 		char *argv [3];
 
 		argv [0] = uevent_helper;