From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933425AbbI3L1T (ORCPT ); Wed, 30 Sep 2015 07:27:19 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:60437 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933224AbbI3L1L (ORCPT ); Wed, 30 Sep 2015 07:27:11 -0400 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org, "David S. Miller" , Arnd Bergmann , Pablo Neira Ayuso , Patrick McHardy , Jozsef Kadlecsik , netfilter-devel@vger.kernel.org, coreteam@netfilter.org Subject: [PATCH 08/12] nfnetlink: use y2038 safe timestamp Date: Wed, 30 Sep 2015 13:26:38 +0200 Message-Id: <1443612402-3000775-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1443612402-3000775-1-git-send-email-arnd@arndb.de> References: <1443612402-3000775-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:hCb7lF2ikNjrfEluIkm4iZvroNTKpfbaNOr2bv8GtcCw31rl6IP MfhtJnsusZ678z0v4ouddOB+huUfazwc5qpgNrY9EAAOb7BwKLzwfMff/v/2a3YCAp0nj2Q cH1KipGtxAzCoPdKffsqS/VGFTtgiSs6B/vg+LI+jMZuDwOKCDb94QpNE8jykqd2yQK/6N4 2aTbwMqbGT/UwPoFm74FQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:mHe3F3mUWyQ=:8WXVEMX7azTmY5jFJVClOm cXaVRFilqncQ8IVF4jwDGtMK0JMKRybwWKF56kdk5xOw70PZoNd612yra3bW12Amm1MUT2wSN XLYbWa8LRnjK9hEbCzx9p5hrqh1Vczl1RiCLafsyKzudAY8SA7uZt6OLJrMFMn9VQgLx3udYr 3c/rssr4xHr6lYhMdk9lGj3BZ4IU0wNGrcUmic4nnSSNvBel11KuWJ/gfy7bJXU0P5P9FawUW MLsx0winryb1x02IhPYoJtTtkA1HT+DnGuM6BzYi6zRR7coMqzngXvnB7F/yOGpvRroUf1RjH 5V/zNEMM9uTuBiCfohPDzUAIdygl/sLnybBeGFLLSgYIF94BbHPp67YKFelkEhXPDJUyFGDDe EYR22cuFs5FwAafXlrcewVrroC5bagYUVwgc4HrQ9Dd2cSkVOXHt611I3tp9cAUfuDXqiLFHa s0nOVsbD7ExbisPi4kM5UNlrl1kfFopIpYXVxEu10TkAcmCFFS/27XD3VWe+s2eNigt6wTNAZ LjSLyIoBZryPgEWnadkM51vCghTr2IrV9w46KHM6niMwqe0jELfpB+q0sbNyE2Pk9dfq8rItG 6aKVBEFsu+AGY67qIBp7qqd3OUEzOo/yYhXW+aKAMz2mqvSYZMUvyUsTZ2idPHjsfCKOUCi+k TZKayU9DCMN1dRk73yvbC1QU+9Lp9C+9n06F53RAhhTj69QPWobr410B/3oSeabaS3x0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Pablo Neira Ayuso Cc: Patrick McHardy Cc: Jozsef Kadlecsik Cc: netfilter-devel@vger.kernel.org Cc: coreteam@netfilter.org --- net/netfilter/nfnetlink_log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; -- 2.1.0.rc2