tunnels: fix netns vs proto registration ordering
Subsystems (4)
PATCH 1/1 tunnels: fix netns vs proto registration ordering
Same stuff as in ip_gre patch: receive hook can be called before netns setup is done, oopsing in net_generic().
Signed-off-by Alexey Dobriyan <[email protected]>
---
net/ipv4/ipip.c | 13 +++++------ net/ipv6/ip6_tunnel.c | 28 +++++++++++++----------- net/ipv6/sit.c | 13 +++++------ net/ipv6/xfrm6_tunnel.c | 55 +++++++++++++++++------------------------------- 4 files changed, 47 insertions(+), 62 deletions(-)
net/ipv4/ipip.c +6 -7
@@ -830,15 +830,14 @@ static int __init ipip_init(void)printk (banner); -if (xfrm4_tunnel_register (&ipip_handler,AF_INET )) { + err =register_pernet_device (&ipip_net_ops); +if (err <0 ) +return err; + err =xfrm4_tunnel_register (&ipip_handler,AF_INET ); +if (err <0 ) { +unregister_pernet_device (&ipip_net_ops);printk (KERN_INFO "ipip init: can't register tunnel\n" ); -return -EAGAIN ; } - - err =register_pernet_device (&ipip_net_ops); -if (err) -xfrm4_tunnel_deregister (&ipip_handler,AF_INET ); -return err; }
net/ipv6/ip6_tunnel.c +15 -13
@@ -1461,27 +1461,29 @@ static int __init ip6_tunnel_init(void) {int err; -if (xfrm6_tunnel_register (&ip4ip6_handler,AF_INET )) { + err =register_pernet_device (&ip6_tnl_net_ops); +if (err <0 ) + goto out_pernet; + + err =xfrm6_tunnel_register (&ip4ip6_handler,AF_INET ); +if (err <0 ) {printk (KERN_ERR "ip6_tunnel init: can't register ip4ip6\n" ); - err = -EAGAIN ; - goto out; + goto out_ip4ip6; } -if (xfrm6_tunnel_register (&ip6ip6_handler,AF_INET6 )) { + err =xfrm6_tunnel_register (&ip6ip6_handler,AF_INET6 ); +if (err <0 ) {printk (KERN_ERR "ip6_tunnel init: can't register ip6ip6\n" ); - err = -EAGAIN ; - goto unreg_ip4ip6; + goto out_ip6ip6; } - err =register_pernet_device (&ip6_tnl_net_ops); -if (err <0 ) - goto err_pernet;return 0 ; -err_pernet: -xfrm6_tunnel_deregister (&ip6ip6_handler,AF_INET6 ); -unreg_ip4ip6: + +out_ip6ip6:xfrm6_tunnel_deregister (&ip4ip6_handler,AF_INET ); -out: +out_ip4ip6: +unregister_pernet_device (&ip6_tnl_net_ops); +out_pernet:return err; }
net/ipv6/sit.c +6 -7
@@ -1227,15 +1227,14 @@ static int __init sit_init(void)printk (KERN_INFO "IPv6 over IPv4 tunneling driver\n" ); -if (xfrm4_tunnel_register (&sit_handler,AF_INET6 ) <0 ) { -printk (KERN_INFO "sit init: Can't add protocol\n" ); -return -EAGAIN ; - } - err =register_pernet_device (&sit_net_ops);if (err <0 ) -xfrm4_tunnel_deregister (&sit_handler,AF_INET6 ); - +return err; + err =xfrm4_tunnel_register (&sit_handler,AF_INET6 ); +if (err <0 ) { +unregister_pernet_device (&sit_net_ops); +printk (KERN_INFO "sit init: Can't add protocol\n" ); + }return err; }
net/ipv6/xfrm6_tunnel.c +20 -35
85 lines not on this page · raw message
From: Alexey Dobriyan <[email protected]>
Date: Tue, 16 Feb 2010 21:05:04 +0200
Quoted 4 lines
Same stuff as in
ip_grepatch: receive hook can be called before netns setup is done, oopsing innet_generic().Signed-off-by Alexey Dobriyan <[email protected]>
Applied to net-next-2.6