CommitterPablo Neira Ayuso (1)
AuthorFlorian Westphal (1)
Branchesmaster (1)


Linux/linux 916f6ef — net/netfilter xt_time.c nf_conntrack_core.c

by Florian Westphal via Pablo Neira Ayuso on ⎇
netfilter: never get/set skb->tstamp

setting net.netfilter.nf_conntrack_timestamp=1 breaks xmit with fq
scheduler.  skb->tstamp might be "refreshed" using ktime_get_real(),
but fq expects CLOCK_MONOTONIC.

This patch removes all places in netfilter that check/set skb->tstamp:

1. To fix the bogus "start" time seen with conntrack timestamping for
   outgoing packets, never use skb->tstamp and always use current time.
2. In nfqueue and nflog, only use skb->tstamp for incoming packets,
   as determined by current hook (prerouting, input, forward).
3. xt_time has to use system clock as well rather than skb->tstamp.
   We could still use skb->tstamp for prerouting/input/foward, but
   I see no advantage to make this conditional.

Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
Cc: Eric Dumazet <edumazet at google.com>
Reported-by: Michal Soltys <soltys at ziu.info>
Signed-off-by: Florian Westphal <fw at strlen.de>
Acked-by: Eric Dumazet <edumazet at google.com>
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
DeltaFile
+14-9net/netfilter/xt_time.c
+2-5net/netfilter/nf_conntrack_core.c
+1-1net/netfilter/nfnetlink_log.c
+1-1net/netfilter/nfnetlink_queue.c
+18-164 files

UnifiedSplitRaw