From c6abd08c13e4ed13d9f5bc9fea3c38cd75f7f213 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 4 May 2010 17:36:47 -0700
Subject: [PATCH] --- yaml --- r: 196068 b: refs/heads/master c:
 5f71a29629b4717445f8b7f5fb8f50c2d262b68e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b4df0223dd98..917af5a751f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 910a7e905f36e51a17d6e8bb4ad6dcd5ac5f1d53
+refs/heads/master: 5f71a29629b4717445f8b7f5fb8f50c2d262b68e
diff --git a/trunk/lib/kobject_uevent.c b/trunk/lib/kobject_uevent.c
index 9084f2550c2a..239c8e83fc28 100644
--- a/trunk/lib/kobject_uevent.c
+++ b/trunk/lib/kobject_uevent.c
@@ -83,6 +83,22 @@ int kobject_action_type(const char *buf, size_t count,
 	return ret;
 }
 
+static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data)
+{
+	struct kobject *kobj = data;
+	const struct kobj_ns_type_operations *ops;
+
+	ops = kobj_ns_ops(kobj);
+	if (ops) {
+		const void *sock_ns, *ns;
+		ns = kobj->ktype->namespace(kobj);
+		sock_ns = ops->netlink_ns(dsk);
+		return sock_ns != ns;
+	}
+
+	return 0;
+}
+
 /**
  * kobject_uevent_env - send an uevent with environmental data
  *
@@ -244,8 +260,10 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
 			}
 
 			NETLINK_CB(skb).dst_group = 1;
-			retval = netlink_broadcast(uevent_sock, skb, 0, 1,
-						   GFP_KERNEL);
+			retval = netlink_broadcast_filtered(uevent_sock, skb,
+							    0, 1, GFP_KERNEL,
+							    kobj_bcast_filter,
+							    kobj);
 			/* ENOBUFS should be handled in userspace */
 			if (retval == -ENOBUFS)
 				retval = 0;