diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2020-10-21 12:55:52 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-10-22 14:49:36 +0200 |
| commit | c77761c8a59405cb7aa44188b30fffe13fbdd02d (patch) | |
| tree | bc35a00156b253db871188c1f1a0e7a9a43dc63b | |
| parent | netfilter: nftables_offload: KASAN slab-out-of-bounds Read in nft_flow_rule_create (diff) | |
| download | wireguard-linux-c77761c8a59405cb7aa44188b30fffe13fbdd02d.tar.xz wireguard-linux-c77761c8a59405cb7aa44188b30fffe13fbdd02d.zip | |
netfilter: nf_fwd_netdev: clear timestamp in forwarding path
Similar to 7980d2eabde8 ("ipvs: clear skb->tstamp in forwarding path").
fq qdisc requires tstamp to be cleared in forwarding path.
Fixes: 8203e2d844d3 ("net: clear skb->tstamp in forwarding paths")
Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | net/netfilter/nf_dup_netdev.c | 1 | ||||
| -rw-r--r-- | net/netfilter/nft_fwd_netdev.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/nf_dup_netdev.c b/net/netfilter/nf_dup_netdev.c index 2b01a151eaa8..a579e59ee5c5 100644 --- a/net/netfilter/nf_dup_netdev.c +++ b/net/netfilter/nf_dup_netdev.c @@ -19,6 +19,7 @@ static void nf_do_netdev_egress(struct sk_buff *skb, struct net_device *dev) skb_push(skb, skb->mac_len); skb->dev = dev; + skb->tstamp = 0; dev_queue_xmit(skb); } diff --git a/net/netfilter/nft_fwd_netdev.c b/net/netfilter/nft_fwd_netdev.c index 3087e23297db..b77985986b24 100644 --- a/net/netfilter/nft_fwd_netdev.c +++ b/net/netfilter/nft_fwd_netdev.c @@ -138,6 +138,7 @@ static void nft_fwd_neigh_eval(const struct nft_expr *expr, return; skb->dev = dev; + skb->tstamp = 0; neigh_xmit(neigh_table, dev, addr, skb); out: regs->verdict.code = verdict; |