Commit a7f18845 authored May 12, 2016 by Florian Westphal Committed by Pablo Neira Ayuso May 12, 2016

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: b28b1e82 ("netfilter: nfnetlink_queue: use y2038 safe timestamp")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 1b7cc307

net/netfilter/nfnetlink_queue.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);