lkml.org 
[lkml]   [2019]   [Dec]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 100/187] bpf: Clear skb->tstamp in bpf_redirect when necessary
    Date
    From: Lorenz Bauer <lmb@cloudflare.com>

    [ 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: 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
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/core/filter.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/net/core/filter.c b/net/core/filter.c
    index 6d0111bfdb4a..2f76461c120d 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);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-12-27 18:43    [W:3.275 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site