diff options
| author |   Lorenz Bauer <lmb@cloudflare.com> | 2019-12-13 18:08:17 +0000 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2019-12-13 15:21:48 -0800 |
| commit | 5133498f4ad1123a5ffd4c08df6431dab882cc32 (patch) | |
| tree | b0e929d19f4151527a372183668f42662bd72390 /net/core | |
| parent | qede: Fix multicast mac configuration (diff) | |
| download | linux-dev-5133498f4ad1123a5ffd4c08df6431dab882cc32.tar.xz linux-dev-5133498f4ad1123a5ffd4c08df6431dab882cc32.zip | |
bpf: Clear skb->tstamp in bpf_redirect when necessary
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: 80b14dee2bea ("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
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index f1e703eed3d2..d914257763b5 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2055,6 +2055,7 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb) } skb->dev = dev; + skb->tstamp = 0; dev_xmit_recursion_inc(); ret = dev_queue_xmit(skb); |