diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-02-29 11:19:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-29 11:19:22 -0800 |
| commit | 5c8cafd65e1448b1d55cad3fb1e42ad42607e5be (patch) | |
| tree | 42b7de16c3724a4f9e6d401313ef2c60da05aa71 /net/ipv4/icmp.c | |
| parent | edf0208702007ec1f6a36756fdd005f771a4cf17 (diff) | |
| download | linux-5c8cafd65e1448b1d55cad3fb1e42ad42607e5be.tar.bz2 | |
[NETNS]: icmp(v6)_sk should not pin a namespace.
So, change icmp(v6)_sk creation/disposal to the scheme used in the
netlink for rtnl, i.e. create a socket in the context of the init_net
and assign the namespace without getting a referrence later.
Also use sk_release_kernel instead of sock_release to properly destroy
such sockets.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/icmp.c')
| -rw-r--r-- | net/ipv4/icmp.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 7c62a0da5264..97d97ada4ce6 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -1146,14 +1146,8 @@ static void __exit icmp_exit(void) { int i; - for_each_possible_cpu(i) { - struct sock *sk; - - sk = __icmp_sk[i]; - if (sk == NULL) - continue; - sock_release(sk->sk_socket); - } + for_each_possible_cpu(i) + sk_release_kernel(__icmp_sk[i]); kfree(__icmp_sk); __icmp_sk = NULL; } @@ -1176,6 +1170,8 @@ int __init icmp_init(void) goto fail; __icmp_sk[i] = sk = sock->sk; + sk_change_net(sk, &init_net); + sk->sk_allocation = GFP_ATOMIC; /* Enough space for 2 64K ICMP packets, including |