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

Commit 2ad5b9e4 authored by Eric Dumazet's avatar Eric Dumazet Committed by Pablo Neira Ayuso
Browse files

netfilter: xt_TEE: don't use destination address found in header 



Torsten Luettgert bisected TEE regression starting with commit
f8126f1d (ipv4: Adjust semantics of rt->rt_gateway.)

The problem is that it tries to ARP-lookup the original destination
address of the forwarded packet, not the address of the gateway.

Fix this using FLOWI_FLAG_KNOWN_NH Julian added in commit
c92b9655 (ipv4: Add FLOWI_FLAG_KNOWN_NH), so that known
nexthop (info->gw.ip) has preference on resolving.

Reported-by: default avatarTorsten Luettgert <ml-netfilter@enda.eu>
Bisected-by: default avatarTorsten Luettgert <ml-netfilter@enda.eu>
Tested-by: default avatarTorsten Luettgert <ml-netfilter@enda.eu>
Cc: Julian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 0b4f5b1d

net/netfilter/xt_TEE.c

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ tee_tg_route4(struct sk_buff *skb, const struct xt_tee_tginfo *info) 
	fl4.daddr = info->gw.ip;

	fl4.flowi4_tos = RT_TOS(iph->tos);

	fl4.flowi4_scope = RT_SCOPE_UNIVERSE;

	fl4.flowi4_flags = FLOWI_FLAG_KNOWN_NH;

	rt = ip_route_output_key(net, &fl4);

	if (IS_ERR(rt))

		return false;