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

Commit ab343801 authored by Eli Cooper's avatar Eli Cooper Committed by David S. Miller
Browse files

ipv6: Don't unset flowi6_proto in ipxip6_tnl_xmit() 



Commit 8eb30be0 ("ipv6: Create ip6_tnl_xmit") unsets
flowi6_proto in ip4ip6_tnl_xmit() and ip6ip6_tnl_xmit().
Since xfrm_selector_match() relies on this info, IPv6 packets
sent by an ip6tunnel cannot be properly selected by their
protocols after removing it. This patch puts flowi6_proto back.

Cc: stable@vger.kernel.org
Fixes: 8eb30be0 ("ipv6: Create ip6_tnl_xmit")
Signed-off-by: default avatarEli Cooper <elicooper@gmx.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b44e108b

net/ipv6/ip6_tunnel.c

+2 −0
Original line number Diff line number Diff line
@@ -1174,6 +1174,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) 
		encap_limit = t->parms.encap_limit;



	memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6));

	fl6.flowi6_proto = IPPROTO_IPIP;



	dsfield = ipv4_get_dsfield(iph);
@@ -1233,6 +1234,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) 
		encap_limit = t->parms.encap_limit;



	memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6));

	fl6.flowi6_proto = IPPROTO_IPV6;



	dsfield = ipv6_get_dsfield(ipv6h);

	if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)