Commit 5483844c authored by Jeremy Sowden's avatar Jeremy Sowden Committed by Steffen Klassert
Browse files

vti4: ipip tunnel deregistration fixes. 



If tunnel registration failed during module initialization, the module
would fail to deregister the IPPROTO_COMP protocol and would attempt to
deregister the tunnel.

The tunnel was not deregistered during module-exit.

Fixes: dd9ee344 ("vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel")
Signed-off-by: default avatarJeremy Sowden <jeremy@azazel.net>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent bfc01ddf

net/ipv4/ip_vti.c

+3 −2
Original line number Diff line number Diff line
@@ -659,9 +659,9 @@ static int __init vti_init(void) 
	return err;



rtnl_link_failed:

	xfrm4_protocol_deregister(&vti_ipcomp4_protocol, IPPROTO_COMP);

xfrm_tunnel_failed:

	xfrm4_tunnel_deregister(&ipip_handler, AF_INET);

xfrm_tunnel_failed:

	xfrm4_protocol_deregister(&vti_ipcomp4_protocol, IPPROTO_COMP);

xfrm_proto_comp_failed:

	xfrm4_protocol_deregister(&vti_ah4_protocol, IPPROTO_AH);

xfrm_proto_ah_failed:
@@ -676,6 +676,7 @@ pernet_dev_failed: 
static void __exit vti_fini(void)

{

	rtnl_link_unregister(&vti_link_ops);

	xfrm4_tunnel_deregister(&ipip_handler, AF_INET);

	xfrm4_protocol_deregister(&vti_ipcomp4_protocol, IPPROTO_COMP);

	xfrm4_protocol_deregister(&vti_ah4_protocol, IPPROTO_AH);

	xfrm4_protocol_deregister(&vti_esp4_protocol, IPPROTO_ESP);

CRA Git | Maintained and supported by SUSTech CRA and CCSE