| Message ID | 1463057034-27694-1-git-send-email-fw@strlen.de |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
On Thu, May 12, 2016 at 02:43:54PM +0200, Florian Westphal wrote: > 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> Argh, my fault. Thanks for fixing up this, applied. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, May 12, 2016 at 05:07:32PM +0200, Pablo Neira Ayuso wrote: > On Thu, May 12, 2016 at 02:43:54PM +0200, Florian Westphal wrote: > > 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> > > Argh, my fault. Thanks for fixing up this, applied. And enqueued for stable 4.4, btw. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index cb5b630..e34256a 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);
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> --- net/netfilter/nfnetlink_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)