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

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

ip6_tunnel: disable dst caching if tunnel is dual-stack 



When an ip6_tunnel is in mode 'any', where the transport layer
protocol can be either 4 or 41, dst_cache must be disabled.

This is because xfrm policies might apply to only one of the two
protocols. Caching dst would cause xfrm policies for one protocol
incorrectly used for the other.

Signed-off-by: default avatarEli Cooper <elicooper@gmx.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55a5ec9b

net/ipv6/ip6_tunnel.c

+5 −4
Original line number Diff line number Diff line
@@ -1074,10 +1074,11 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield, 
			memcpy(&fl6->daddr, addr6, sizeof(fl6->daddr));

			neigh_release(neigh);

		}

	} else if (!(t->parms.flags &

		     (IP6_TNL_F_USE_ORIG_TCLASS | IP6_TNL_F_USE_ORIG_FWMARK))) {

		/* enable the cache only only if the routing decision does

		 * not depend on the current inner header value

	} else if (t->parms.proto != 0 && !(t->parms.flags &

					    (IP6_TNL_F_USE_ORIG_TCLASS |

					     IP6_TNL_F_USE_ORIG_FWMARK))) {

		/* enable the cache only if neither the outer protocol nor the

		 * routing decision depends on the current inner header value

		 */

		use_cache = true;

	}