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

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

netns xfrm: fixup xfrm6_tunnel error propagation 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ce96bc86

net/ipv6/xfrm6_tunnel.c

+11 −5
Original line number Diff line number Diff line
@@ -353,13 +353,19 @@ static struct xfrm6_tunnel xfrm46_tunnel_handler = { 


static int __init xfrm6_tunnel_init(void)

{

	if (xfrm_register_type(&xfrm6_tunnel_type, AF_INET6) < 0)

	int rv;



	rv = xfrm_register_type(&xfrm6_tunnel_type, AF_INET6);

	if (rv < 0)

		goto err;

	if (xfrm6_tunnel_register(&xfrm6_tunnel_handler, AF_INET6))

	rv = xfrm6_tunnel_register(&xfrm6_tunnel_handler, AF_INET6);

	if (rv < 0)

		goto unreg;

	if (xfrm6_tunnel_register(&xfrm46_tunnel_handler, AF_INET))

	rv = xfrm6_tunnel_register(&xfrm46_tunnel_handler, AF_INET);

	if (rv < 0)

		goto dereg6;

	if (xfrm6_tunnel_spi_init() < 0)

	rv = xfrm6_tunnel_spi_init();

	if (rv < 0)

		goto dereg46;

	return 0;
@@ -370,7 +376,7 @@ dereg6: 
unreg:

	xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);

err:

	return -EAGAIN;

	return rv;

}



static void __exit xfrm6_tunnel_fini(void)