Commit 4e994776 authored Feb 26, 2018 by Thomas Winter Committed by David S. Miller Feb 26, 2018

ip_tunnel: Do not use mark in skb by default



This reverts commit 5c38bd1b.

skb->mark contains the mark the encapsulated traffic which
can result in incorrect routing decisions being made such
as routing loops if the route chosen is via tunnel itself.
The correct method should be to use tunnel->fwmark.

Signed-off-by: Thomas Winter <thomas.winter@alliedtelesis.co.nz>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0e5a82ef

net/ipv4/ip_tunnel.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -710,16 +710,9 @@ void ip_tunnel_xmit(struct sk_buff skb, struct net_device dev,
		}
		}

		if (tunnel->fwmark) {
		init_tunnel_flow(&fl4, protocol, dst, tnl_params->saddr,
		tunnel->parms.o_key, RT_TOS(tos), tunnel->parms.link,
		tunnel->fwmark);
		}
		else {
		init_tunnel_flow(&fl4, protocol, dst, tnl_params->saddr,
		tunnel->parms.o_key, RT_TOS(tos), tunnel->parms.link,
		skb->mark);
		}

		if (ip_tunnel_encap(skb, tunnel, &protocol, &fl4) < 0)
		goto tx_error;

Admin message