p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Eric W. Biederman 2015-05-08 21:11:33 -05:00 committed by David S. Miller
parent 26abe14379
commit 13d3078e22
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/netlink/af_netlink.c
View File

@ -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)) if (sock_create_lite(PF_NETLINK, SOCK_DGRAM, unit, &sock))
return NULL; return NULL;
/*
* We have to just have a reference on the net from sk, but don't if (__netlink_create(net, sock, cb_mutex, unit, 1) < 0)
* 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)
goto out_sock_release_nosk; goto out_sock_release_nosk;
sk = sock->sk; sk = sock->sk;
sk_change_net(sk, net);
if (!cfg || cfg->groups < 32) if (!cfg || cfg->groups < 32)
groups = 32; groups = 32;
@ -2581,7 +2576,10 @@ EXPORT_SYMBOL(__netlink_kernel_create);
void void
netlink_kernel_release(struct sock *sk) 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); EXPORT_SYMBOL(netlink_kernel_release);