kobject: Send hotplug events in all network namespaces

Open a copy of the uevent kernel socket in each network
namespace so we can send uevents in all network namespaces.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 7b48d44ced6ec2972fdd45cbc2c0d084dcf22f82..9084f2550c2a1c512d12e35e738e657ce53db6ae 100644 (file)
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -24,13 +24,19 @@
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <net/sock.h>
+#include <net/net_namespace.h>
 
 
 u64 uevent_seqnum;
 char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
 static DEFINE_SPINLOCK(sequence_lock);
-#if defined(CONFIG_NET)
-static struct sock *uevent_sock;
+#ifdef CONFIG_NET
+struct uevent_sock {
+       struct list_head list;
+       struct sock *sk;
+};
+static LIST_HEAD(uevent_sock_list);
+static DEFINE_MUTEX(uevent_sock_mutex);
 #endif
 
 /* the strings here must match the enum in include/linux/kobject.h */
@@ -100,6 +106,9 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
        u64 seq;
        int i = 0;
        int retval = 0;
+#ifdef CONFIG_NET
+       struct uevent_sock *ue_sk;
+#endif
 
        pr_debug("kobject: '%s' (%p): %s\n",
                 kobject_name(kobj), kobj, __func__);
@@ -211,7 +220,9 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
 
 #if defined(CONFIG_NET)
        /* send netlink message */
-       if (uevent_sock) {
+       mutex_lock(&uevent_sock_mutex);
+       list_for_each_entry(ue_sk, &uevent_sock_list, list) {
+               struct sock *uevent_sock = ue_sk->sk;
                struct sk_buff *skb;
                size_t len;
 
@@ -241,6 +252,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                } else
                        retval = -ENOMEM;
        }
+       mutex_unlock(&uevent_sock_mutex);
 #endif
 
        /* call uevent_helper, usually only enabled during early boot */
@@ -320,18 +332,58 @@ int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
 EXPORT_SYMBOL_GPL(add_uevent_var);
 
 #if defined(CONFIG_NET)
-static int __init kobject_uevent_init(void)
+static int uevent_net_init(struct net *net)
 {
-       uevent_sock = netlink_kernel_create(&init_net, NETLINK_KOBJECT_UEVENT,
-                                           1, NULL, NULL, THIS_MODULE);
-       if (!uevent_sock) {
+       struct uevent_sock *ue_sk;
+
+       ue_sk = kzalloc(sizeof(*ue_sk), GFP_KERNEL);
+       if (!ue_sk)
+               return -ENOMEM;
+
+       ue_sk->sk = netlink_kernel_create(net, NETLINK_KOBJECT_UEVENT,
+                                         1, NULL, NULL, THIS_MODULE);
+       if (!ue_sk->sk) {
                printk(KERN_ERR
                       "kobject_uevent: unable to create netlink socket!\n");
                return -ENODEV;
        }
-       netlink_set_nonroot(NETLINK_KOBJECT_UEVENT, NL_NONROOT_RECV);
+       mutex_lock(&uevent_sock_mutex);
+       list_add_tail(&ue_sk->list, &uevent_sock_list);
+       mutex_unlock(&uevent_sock_mutex);
        return 0;
 }
 
+static void uevent_net_exit(struct net *net)
+{
+       struct uevent_sock *ue_sk;
+
+       mutex_lock(&uevent_sock_mutex);
+       list_for_each_entry(ue_sk, &uevent_sock_list, list) {
+               if (sock_net(ue_sk->sk) == net)
+                       goto found;
+       }
+       mutex_unlock(&uevent_sock_mutex);
+       return;
+
+found:
+       list_del(&ue_sk->list);
+       mutex_unlock(&uevent_sock_mutex);
+
+       netlink_kernel_release(ue_sk->sk);
+       kfree(ue_sk);
+}
+
+static struct pernet_operations uevent_net_ops = {
+       .init   = uevent_net_init,
+       .exit   = uevent_net_exit,
+};
+
+static int __init kobject_uevent_init(void)
+{
+       netlink_set_nonroot(NETLINK_KOBJECT_UEVENT, NL_NONROOT_RECV);
+       return register_pernet_subsys(&uevent_net_ops);
+}
+
+
 postcore_initcall(kobject_uevent_init);
 #endif