Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5aa407f authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

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: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2892f02

net/ipv4/ipip.c

+6 −7
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -84,23 +84,6 @@ static inline unsigned xfrm6_tunnel_spi_hash_byspi(u32 spi) 
	return spi % XFRM6_TUNNEL_SPI_BYSPI_HSIZE;

}





static int __init xfrm6_tunnel_spi_init(void)

{

	xfrm6_tunnel_spi_kmem = kmem_cache_create("xfrm6_tunnel_spi",

						  sizeof(struct xfrm6_tunnel_spi),

						  0, SLAB_HWCACHE_ALIGN,

						  NULL);

	if (!xfrm6_tunnel_spi_kmem)

		return -ENOMEM;

	return 0;

}



static void xfrm6_tunnel_spi_fini(void)

{

	kmem_cache_destroy(xfrm6_tunnel_spi_kmem);

}



static struct xfrm6_tunnel_spi *__xfrm6_tunnel_spi_lookup(struct net *net, xfrm_address_t *saddr)

{

	struct xfrm6_tunnel_net *xfrm6_tn = xfrm6_tunnel_pernet(net);
@@ -375,42 +358,44 @@ static int __init xfrm6_tunnel_init(void) 
{

	int rv;



	xfrm6_tunnel_spi_kmem = kmem_cache_create("xfrm6_tunnel_spi",

						  sizeof(struct xfrm6_tunnel_spi),

						  0, SLAB_HWCACHE_ALIGN,

						  NULL);

	if (!xfrm6_tunnel_spi_kmem)

		return -ENOMEM;

	rv = register_pernet_subsys(&xfrm6_tunnel_net_ops);

	if (rv < 0)

		goto out_pernet;

	rv = xfrm_register_type(&xfrm6_tunnel_type, AF_INET6);

	if (rv < 0)

		goto err;

		goto out_type;

	rv = xfrm6_tunnel_register(&xfrm6_tunnel_handler, AF_INET6);

	if (rv < 0)

		goto unreg;

		goto out_xfrm6;

	rv = xfrm6_tunnel_register(&xfrm46_tunnel_handler, AF_INET);

	if (rv < 0)

		goto dereg6;

	rv = xfrm6_tunnel_spi_init();

	if (rv < 0)

		goto dereg46;

	rv = register_pernet_subsys(&xfrm6_tunnel_net_ops);

	if (rv < 0)

		goto deregspi;

		goto out_xfrm46;

	return 0;



deregspi:

	xfrm6_tunnel_spi_fini();

dereg46:

	xfrm6_tunnel_deregister(&xfrm46_tunnel_handler, AF_INET);

dereg6:

out_xfrm46:

	xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);

unreg:

out_xfrm6:

	xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);

err:

out_type:

	unregister_pernet_subsys(&xfrm6_tunnel_net_ops);

out_pernet:

	kmem_cache_destroy(xfrm6_tunnel_spi_kmem);

	return rv;

}



static void __exit xfrm6_tunnel_fini(void)

{

	unregister_pernet_subsys(&xfrm6_tunnel_net_ops);

	xfrm6_tunnel_spi_fini();

	xfrm6_tunnel_deregister(&xfrm46_tunnel_handler, AF_INET);

	xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);

	xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);

	unregister_pernet_subsys(&xfrm6_tunnel_net_ops);

	kmem_cache_destroy(xfrm6_tunnel_spi_kmem);

}



module_init(xfrm6_tunnel_init);