| Message ID | 1443612402-3000775-9-git-send-email-arnd@arndb.de |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Pablo Neira |
| Headers | show |
On Wed, Sep 30, 2015 at 01:26:38PM +0200, Arnd Bergmann wrote: > The __build_packet_message function fills a nfulnl_msg_packet_timestamp > structure that uses 64-bit seconds and is therefore y2038 safe, but > it uses an intermediate 'struct timespec' which is not. > > This trivially changes the code to use 'struct timespec64' instead, > to correct the result on 32-bit architectures. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Cc: Pablo Neira Ayuso <pablo@netfilter.org> > Cc: Patrick McHardy <kaber@trash.net> > Cc: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> > Cc: netfilter-devel@vger.kernel.org > Cc: coreteam@netfilter.org Acked-by: Pablo Neira Ayuso <pablo@netfilter.org> BTW, I don't see the patch for nfnetlink_queue and I think I have seen it in the diffstat from your cover letter. -- 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 Friday 02 October 2015 14:53:55 Pablo Neira Ayuso wrote: > On Wed, Sep 30, 2015 at 01:26:38PM +0200, Arnd Bergmann wrote: > > The __build_packet_message function fills a nfulnl_msg_packet_timestamp > > structure that uses 64-bit seconds and is therefore y2038 safe, but > > it uses an intermediate 'struct timespec' which is not. > > > > This trivially changes the code to use 'struct timespec64' instead, > > to correct the result on 32-bit architectures. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Cc: Pablo Neira Ayuso <pablo@netfilter.org> > > Cc: Patrick McHardy <kaber@trash.net> > > Cc: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> > > Cc: netfilter-devel@vger.kernel.org > > Cc: coreteam@netfilter.org > > Acked-by: Pablo Neira Ayuso <pablo@netfilter.org> Thanks > BTW, I don't see the patch for nfnetlink_queue and I think I have seen > it in the diffstat from your cover letter. My text must have been unclear. What I meant is that I have identified that file as needing a patch (among 120 other files) but have not written one. This one is trivial, it just needs replacing this code if (entskb->tstamp.tv64) { struct nfqnl_msg_packet_timestamp ts; struct timeval tv = ktime_to_timeval(entskb->tstamp); ts.sec = cpu_to_be64(tv.tv_sec); ts.usec = cpu_to_be64(tv.tv_usec); if (nla_put(skb, NFQA_TIMESTAMP, sizeof(ts), &ts)) goto nla_put_failure; } with a version using ktime_to_timespec64. If you or someone else does this, that makes one less file for me to track. Arnd -- 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_log.c b/net/netfilter/nfnetlink_log.c index 4670821b569d..cc2300f4e177 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -538,9 +538,9 @@ __build_packet_message(struct nfnl_log_net *log, if (skb->tstamp.tv64) { struct nfulnl_msg_packet_timestamp ts; - struct timeval tv = ktime_to_timeval(skb->tstamp); - ts.sec = cpu_to_be64(tv.tv_sec); - ts.usec = cpu_to_be64(tv.tv_usec); + struct timespec64 kts = ktime_to_timespec64(skb->tstamp); + ts.sec = cpu_to_be64(kts.tv_sec); + ts.usec = cpu_to_be64(kts.tv_nsec / NSEC_PER_USEC); if (nla_put(inst->skb, NFULA_TIMESTAMP, sizeof(ts), &ts)) goto nla_put_failure;
The __build_packet_message function fills a nfulnl_msg_packet_timestamp structure that uses 64-bit seconds and is therefore y2038 safe, but it uses an intermediate 'struct timespec' which is not. This trivially changes the code to use 'struct timespec64' instead, to correct the result on 32-bit architectures. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Pablo Neira Ayuso <pablo@netfilter.org> Cc: Patrick McHardy <kaber@trash.net> Cc: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Cc: netfilter-devel@vger.kernel.org Cc: coreteam@netfilter.org --- net/netfilter/nfnetlink_log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)