These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / core / sock_diag.c

diff --git a/kernel/net/core/sock_diag.c b/kernel/net/core/sock_diag.c
index 556ecf9..0c1d58d 100644 (file)
--- a/kernel/net/core/sock_diag.c
+++ b/kernel/net/core/sock_diag.c
@@ -1,3 +1,5 @@
+/* License: GPL */
+
 #include <linux/mutex.h>
 #include <linux/socket.h>
 #include <linux/skbuff.h>
@@ -5,6 +7,9 @@
 #include <net/net_namespace.h>
 #include <linux/module.h>
 #include <net/sock.h>
+#include <linux/kernel.h>
+#include <linux/tcp.h>
+#include <linux/workqueue.h>
 
 #include <linux/inet_diag.h>
 #include <linux/sock_diag.h>
@@ -12,6 +17,7 @@
 static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
 static DEFINE_MUTEX(sock_diag_table_mutex);
+static struct workqueue_struct *broadcast_wq;
 
 static u64 sock_gen_cookie(struct sock *sk)
 {
@@ -104,6 +110,62 @@ out:
 }
 EXPORT_SYMBOL(sock_diag_put_filterinfo);
 
+struct broadcast_sk {
+       struct sock *sk;
+       struct work_struct work;
+};
+
+static size_t sock_diag_nlmsg_size(void)
+{
+       return NLMSG_ALIGN(sizeof(struct inet_diag_msg)
+              + nla_total_size(sizeof(u8)) /* INET_DIAG_PROTOCOL */
+              + nla_total_size(sizeof(struct tcp_info))); /* INET_DIAG_INFO */
+}
+
+static void sock_diag_broadcast_destroy_work(struct work_struct *work)
+{
+       struct broadcast_sk *bsk =
+               container_of(work, struct broadcast_sk, work);
+       struct sock *sk = bsk->sk;
+       const struct sock_diag_handler *hndl;
+       struct sk_buff *skb;
+       const enum sknetlink_groups group = sock_diag_destroy_group(sk);
+       int err = -1;
+
+       WARN_ON(group == SKNLGRP_NONE);
+
+       skb = nlmsg_new(sock_diag_nlmsg_size(), GFP_KERNEL);
+       if (!skb)
+               goto out;
+
+       mutex_lock(&sock_diag_table_mutex);
+       hndl = sock_diag_handlers[sk->sk_family];
+       if (hndl && hndl->get_info)
+               err = hndl->get_info(skb, sk);
+       mutex_unlock(&sock_diag_table_mutex);
+
+       if (!err)
+               nlmsg_multicast(sock_net(sk)->diag_nlsk, skb, 0, group,
+                               GFP_KERNEL);
+       else
+               kfree_skb(skb);
+out:
+       sk_destruct(sk);
+       kfree(bsk);
+}
+
+void sock_diag_broadcast_destroy(struct sock *sk)
+{
+       /* Note, this function is often called from an interrupt context. */
+       struct broadcast_sk *bsk =
+               kmalloc(sizeof(struct broadcast_sk), GFP_ATOMIC);
+       if (!bsk)
+               return sk_destruct(sk);
+       bsk->sk = sk;
+       INIT_WORK(&bsk->work, sock_diag_broadcast_destroy_work);
+       queue_work(broadcast_wq, &bsk->work);
+}
+
 void sock_diag_register_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh))
 {
        mutex_lock(&sock_diag_table_mutex);
@@ -214,10 +276,32 @@ static void sock_diag_rcv(struct sk_buff *skb)
        mutex_unlock(&sock_diag_mutex);
 }
 
+static int sock_diag_bind(struct net *net, int group)
+{
+       switch (group) {
+       case SKNLGRP_INET_TCP_DESTROY:
+       case SKNLGRP_INET_UDP_DESTROY:
+               if (!sock_diag_handlers[AF_INET])
+                       request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK,
+                                      NETLINK_SOCK_DIAG, AF_INET);
+               break;
+       case SKNLGRP_INET6_TCP_DESTROY:
+       case SKNLGRP_INET6_UDP_DESTROY:
+               if (!sock_diag_handlers[AF_INET6])
+                       request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK,
+                                      NETLINK_SOCK_DIAG, AF_INET);
+               break;
+       }
+       return 0;
+}
+
 static int __net_init diag_net_init(struct net *net)
 {
        struct netlink_kernel_cfg cfg = {
+               .groups = SKNLGRP_MAX,
                .input  = sock_diag_rcv,
+               .bind   = sock_diag_bind,
+               .flags  = NL_CFG_F_NONROOT_RECV,
        };
 
        net->diag_nlsk = netlink_kernel_create(net, NETLINK_SOCK_DIAG, &cfg);
@@ -237,15 +321,8 @@ static struct pernet_operations diag_net_ops = {
 
 static int __init sock_diag_init(void)
 {
+       broadcast_wq = alloc_workqueue("sock_diag_events", 0, 0);
+       BUG_ON(!broadcast_wq);
        return register_pernet_subsys(&diag_net_ops);
 }
-
-static void __exit sock_diag_exit(void)
-{
-       unregister_pernet_subsys(&diag_net_ops);
-}
-
-module_init(sock_diag_init);
-module_exit(sock_diag_exit);
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_SOCK_DIAG);
+device_initcall(sock_diag_init);