Commit e3d5f12b authored Dec 13, 2019 by Lorenz Bauer Committed by Greg Kroah-Hartman Jan 12, 2020

bpf: Clear skb->tstamp in bpf_redirect when necessary



[ Upstream commit 5133498f4ad1123a5ffd4c08df6431dab882cc32 ]

Redirecting a packet from ingress to egress by using bpf_redirect
breaks if the egress interface has an fq qdisc installed. This is the same
problem as fixed in 'commit 8203e2d844d3 ("net: clear skb->tstamp in forwarding paths")

Clear skb->tstamp when redirecting into the egress path.

Fixes: 80b14dee ("net: Add a new socket option for a future transmit time.")
Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/bpf/20191213180817.2510-1-lmb@cloudflare.com


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 12ac1eb6

net/core/filter.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2007,6 +2007,7 @@ static inline int __bpf_tx_skb(struct net_device dev, struct sk_buff skb)
		}

		skb->dev = dev;
		skb->tstamp = 0;

		__this_cpu_inc(xmit_recursion);
		ret = dev_queue_xmit(skb);