diff options
| author |   Florian Westphal <fw@strlen.de> | 2016-05-12 14:43:54 +0200 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2016-05-12 17:06:59 +0200 |
| commit | a7f1884554b81bd68cd435d72f09a3527629ac43 (patch) | |
| tree | 68d0e0ee2127ff14ee512fea97fec5aeecd7704f /net/netfilter/nfnetlink_queue.c | |
| parent | Merge branch 'bnxt_en-fixes' (diff) | |
| download | linux-dev-a7f1884554b81bd68cd435d72f09a3527629ac43.tar.xz linux-dev-a7f1884554b81bd68cd435d72f09a3527629ac43.zip | |
netfilter: nfnetlink_queue: fix timestamp attribute
Since 4.4 we erronously use timestamp of the netlink skb (which is zero).
Bugzilla: https://bugzilla.netfilter.org/show_bug.cgi?id=1066
Fixes: b28b1e826f818c30ea7 ("netfilter: nfnetlink_queue: use y2038 safe timestamp")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nfnetlink_queue.c')
| -rw-r--r-- | net/netfilter/nfnetlink_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index cb5b630a645b..e34256a0e7e9 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -499,7 +499,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, if (entskb->tstamp.tv64) { struct nfqnl_msg_packet_timestamp ts; - struct timespec64 kts = ktime_to_timespec64(skb->tstamp); + struct timespec64 kts = ktime_to_timespec64(entskb->tstamp); ts.sec = cpu_to_be64(kts.tv_sec); ts.usec = cpu_to_be64(kts.tv_nsec / NSEC_PER_USEC); |