summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Fedorenko <vfedorenko@novek.ru>2020-05-20 11:50:48 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-03 08:16:23 +0200
commit72e2d903bda5aeb9ead15bd539f0d4ae048aab9e (patch)
tree958ef3149df5fbc01ca3bb069942b34ef3896c31
parentdecc637b580f7b021f020ee573c1419141eceef4 (diff)
downloadlinux-stable-72e2d903bda5aeb9ead15bd539f0d4ae048aab9e.tar.gz
linux-stable-72e2d903bda5aeb9ead15bd539f0d4ae048aab9e.tar.bz2
linux-stable-72e2d903bda5aeb9ead15bd539f0d4ae048aab9e.zip
net: ipip: fix wrong address family in init error path
[ Upstream commit 57ebc8f08504f176eb0f25b3e0fde517dec61a4f ] In case of error with MPLS support the code is misusing AF_INET instead of AF_MPLS. Fixes: 1b69e7e6c4da ("ipip: support MPLS over IPv4") Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/ipv4/ipip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 56d71a004dce..bd23a2d01b6c 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -689,7 +689,7 @@ out:
rtnl_link_failed:
#if IS_ENABLED(CONFIG_MPLS)
- xfrm4_tunnel_deregister(&mplsip_handler, AF_INET);
+ xfrm4_tunnel_deregister(&mplsip_handler, AF_MPLS);
xfrm_tunnel_mplsip_failed:
#endif