* [PATCH nf] netfilter: nfnetlink_queue: fix timestamp attribute
@ 2016-05-12 12:43 Florian Westphal
2016-05-12 15:07 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Florian Westphal @ 2016-05-12 12:43 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
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(-)
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);
--
2.7.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH nf] netfilter: nfnetlink_queue: fix timestamp attribute
2016-05-12 12:43 [PATCH nf] netfilter: nfnetlink_queue: fix timestamp attribute Florian Westphal
@ 2016-05-12 15:07 ` Pablo Neira Ayuso
2016-05-12 15:23 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2016-05-12 15:07 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
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.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH nf] netfilter: nfnetlink_queue: fix timestamp attribute
2016-05-12 15:07 ` Pablo Neira Ayuso
@ 2016-05-12 15:23 ` Pablo Neira Ayuso
0 siblings, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2016-05-12 15:23 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-12 15:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-12 12:43 [PATCH nf] netfilter: nfnetlink_queue: fix timestamp attribute Florian Westphal
2016-05-12 15:07 ` Pablo Neira Ayuso
2016-05-12 15:23 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).