summaryrefslogtreecommitdiffstats
path: root/net/netlink/af_netlink.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-05-08 21:11:33 -0500
committerDavid S. Miller <davem@davemloft.net>2015-05-11 10:50:18 -0400
commit13d3078e22f5651cd0184ce1b4e4ab8a46c62b27 (patch)
treeb771d13192e3239d6a240e266e834dbdca647da1 /net/netlink/af_netlink.c
parent26abe14379f8e2fa3fd1bcf97c9a7ad9364886fe (diff)
downloadlinux-stable-13d3078e22f5651cd0184ce1b4e4ab8a46c62b27.tar.gz
linux-stable-13d3078e22f5651cd0184ce1b4e4ab8a46c62b27.tar.bz2
linux-stable-13d3078e22f5651cd0184ce1b4e4ab8a46c62b27.zip
netlink: Create kernel netlink sockets in the proper network namespace
Utilize the new functionality of sk_alloc so that nothing needs to be done to suprress the reference counting on kernel sockets. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink/af_netlink.c')
-rw-r--r--net/netlink/af_netlink.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index be6665ab7f40..e9b9559731bb 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2516,16 +2516,11 @@ __netlink_kernel_create(struct net *net, int unit, struct module *module,
if (sock_create_lite(PF_NETLINK, SOCK_DGRAM, unit, &sock))
return NULL;
- /*
- * We have to just have a reference on the net from sk, but don't
- * get_net it. Besides, we cannot get and then put the net here.
- * So we create one inside init_net and the move it to net.
- */
- if (__netlink_create(&init_net, sock, cb_mutex, unit, 0) < 0)
+
+ if (__netlink_create(net, sock, cb_mutex, unit, 1) < 0)
goto out_sock_release_nosk;
sk = sock->sk;
- sk_change_net(sk, net);
if (!cfg || cfg->groups < 32)
groups = 32;
@@ -2581,7 +2576,10 @@ EXPORT_SYMBOL(__netlink_kernel_create);
void
netlink_kernel_release(struct sock *sk)
{
- sk_release_kernel(sk);
+ if (sk == NULL || sk->sk_socket == NULL)
+ return;
+
+ sock_release(sk->sk_socket);
}
EXPORT_SYMBOL(netlink_kernel_release);