Subject: patch hotplug-netns-aware-uevent_helper.patch added to gregkh-2.6 tree

From: <[email-masked]>
Date: Thu, 20 May 2010 11:10:37 -0700

This is a note to let you know that I've just added the patch titled

    Subject: hotplug: netns aware uevent_helper

to my gregkh-2.6 tree.  Its filename is

    hotplug-netns-aware-uevent_helper.patch

This tree can be found at 
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

>>From [email-masked]  Thu May 20 10:45:13 2010
From: "Eric W. Biederman" <[email-masked]>
Date: Tue,  4 May 2010 17:36:48 -0700
Subject: hotplug: netns aware uevent_helper
To: Greg Kroah-Hartman <[email-masked]>
Cc: Kay Sievers <[email-masked]>, [email-masked], Tejun Heo <[email-masked]>, Cornelia Huck <[email-masked]>, Eric Dumazet <[email-masked]>, Benjamin LaHaise <[email-masked]>, Serge Hallyn <[email-masked]>, <[email-masked]>, David Miller <[email-masked]>, "Eric W. Biederman" <[email-masked]>
Message-ID: <[email-masked]>

From: Eric W. Biederman <[email-masked]>

It only makes sense for uevent_helper to get events
in the intial namespaces.  It's invocation is not
per namespace and it is not clear how we could make
it's invocation namespace aware.

Signed-off-by: Eric W. Biederman <[email-masked]>
Acked-by: David S. Miller <[email-masked]>
Signed-off-by: Greg Kroah-Hartman <[email-masked]>

---
 lib/kobject_uevent.c |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

--- a/lib/kobject_uevent.c
+++ b/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
 	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 *k
 #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;