aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/icmp.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@aristanetworks.com>2009-02-22 03:09:14 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-22 22:54:48 -0500
commit959d2726499175c6b724d87fed1dafca7582efe2 (patch)
tree652620f82916d8f60bf5a58bae03624af1bb3f26 /net/ipv4/icmp.c
parenta6e8f27f3c02b0c0d0c45d14b2f4a8810c9a7dc7 (diff)
netns: Fix icmp shutdown.
Recently I had a kernel panic in icmp_send during a network namespace cleanup. There were packets in the arp queue that failed to be sent and we attempted to generate an ICMP host unreachable message, but failed because icmp_sk_exit had already been called. The network devices are removed from a network namespace and their arp queues are flushed before we do attempt to shutdown subsystems so this error should have been impossible. It turns out icmp_init is using register_pernet_device instead of register_pernet_subsys. Which resulted in icmp being shut down while we still had the possibility of packets in flight, making a nasty NULL pointer deference in interrupt context possible. Changing this to register_pernet_subsys fixes the problem in my testing. Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com> Acked-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/icmp.c')
-rw-r--r--net/ipv4/icmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 382800a62b31..3f50807237e0 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -1207,7 +1207,7 @@ static struct pernet_operations __net_initdata icmp_sk_ops = {
1207 1207
1208int __init icmp_init(void) 1208int __init icmp_init(void)
1209{ 1209{
1210 return register_pernet_device(&icmp_sk_ops); 1210 return register_pernet_subsys(&icmp_sk_ops);
1211} 1211}
1212 1212
1213EXPORT_SYMBOL(icmp_err_convert); 1213EXPORT_SYMBOL(icmp_err_convert);