[NETNS]: Inet control socket should not hold a namespace.

This is a generic requirement, so make inet_ctl_sock_create namespace
aware and create a inet_ctl_sock_destroy wrapper around
sk_release_kernel.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 4 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 5669c895c873..b12803bcba56 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1003,7 +1003,7 @@ static int __init dccp_v4_init(void)
         inet_register_protosw(&dccp_v4_protosw);
 
         err = inet_ctl_sock_create(&dccp_v4_ctl_sk, PF_INET,
-                                   SOCK_DCCP, IPPROTO_DCCP);
+                                   SOCK_DCCP, IPPROTO_DCCP, &init_net);
         if (err)
                 goto out_unregister_protosw;
 out:
@@ -1018,7 +1018,7 @@ out_proto_unregister:
 
 static void __exit dccp_v4_exit(void)
 {
-        sock_release(dccp_v4_ctl_sk->sk_socket);
+        inet_ctl_sock_destroy(dccp_v4_ctl_sk);
         inet_unregister_protosw(&dccp_v4_protosw);
         inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP);
         proto_unregister(&dccp_v4_prot);
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index cf598bfc6a18..94d749e6d494 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -1185,7 +1185,7 @@ static int __init dccp_v6_init(void)
         inet6_register_protosw(&dccp_v6_protosw);
 
         err = inet_ctl_sock_create(&dccp_v6_ctl_sk, PF_INET6,
-                                   SOCK_DCCP, IPPROTO_DCCP);
+                                   SOCK_DCCP, IPPROTO_DCCP, &init_net);
         if (err != 0)
                 goto out_unregister_protosw;
 out:
@@ -1200,7 +1200,7 @@ out_unregister_proto:
 
 static void __exit dccp_v6_exit(void)
 {
-        sock_release(dccp_v6_ctl_sk->sk_socket);
+        inet_ctl_sock_destroy(dccp_v6_ctl_sk);
         inet6_del_protocol(&dccp_v6_protocol, IPPROTO_DCCP);
         inet6_unregister_protosw(&dccp_v6_protosw);
         proto_unregister(&dccp_v6_prot);