From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751413AbbJBVXp (ORCPT ); Fri, 2 Oct 2015 17:23:45 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:65315 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750991AbbJBVXm (ORCPT ); Fri, 2 Oct 2015 17:23:42 -0400 From: Arnd Bergmann To: Pablo Neira Ayuso Cc: netdev@vger.kernel.org, y2038@lists.linaro.org, linux-kernel@vger.kernel.org, "David S. Miller" , Patrick McHardy , Jozsef Kadlecsik , netfilter-devel@vger.kernel.org, coreteam@netfilter.org Subject: Re: [PATCH 08/12] nfnetlink: use y2038 safe timestamp Date: Fri, 02 Oct 2015 23:23:30 +0200 Message-ID: <5073868.Fiy2YhEjWN@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20151002125355.GA31638@salvia> References: <1443612402-3000775-1-git-send-email-arnd@arndb.de> <1443612402-3000775-9-git-send-email-arnd@arndb.de> <20151002125355.GA31638@salvia> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:CfSoLClTV8Nt2QgJo0w7Y9RzDmXEdqM6PAG72wxXdRbUFxNGcCs TA/YvRcy69B01HO2MUWtUYrCoFcbgi06Yli0p8IAaz+FtVEWRGcoub10sbAMG755wXgili1 jbVr02CkVL8zvLUkP+pqAPVsiAKdyOcNKYhPfOoGYL3QGFkrw6kzDXVCrxN7D6ctRh1kJll dS9hspHmI2Uc80vn8dQ7Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:j0VDPjmzKBQ=:fbt9uSCFrgGEQXURgZVuHx eO1LuNNjfPi2lw1O914DbUToScCqQVLH+xkX9yOI+mbXZEDwwolH3jmjWWI0dzZdnX6oy/iHF DPAIi8w/vma38vNcMlLaiP8GK/1wsK8ff1xmd4mec8Ep2MO4eBl2ATQWF79y3mYpEDFwSQPnP f4a72f5C4vymF0K/5hZ2Jzv+Ky5A+jKtjJJHVnzI9zfbtD6WtGW7B9dPn32pGe7MQ2/q5ybIv B0uaA9E7+E8YPz7GOS7UApq0Mx2iOgE8tjHS9W7mzZEFQC1DIbT4p17Dv6A/LOUSUdmmT7Hki qUZiVkwTm/FRadZsh7E6rjr3rHyd0Nth2PPnB0X/0cOmpTnkKC3jK2caIcKtllf69FhWp8/t4 TvQjlGEfOh3rQS3JCjtH47u5lvpkcDwwFtPEfgcW8sg2QciXN1Z0OuIyDwG9DQTCOoErZ454+ uyPOBCmRFO6mYNLykWm4JJlVb6n7gBt/fRY7i932F6Xua8q62NgktKN3MjT4wwWDtZpQ2mx3E TPWesY2xSfYQMYL2tJ9Zg1nhnb9w3Wvm5k9/pKWxprEUfKaQcx6o9xE0fyQYP4e1sAAW5YQxK 1jNq/7hmJEubjWavKT7BHQlvk+w9hHMi7bRNquESCUbpn77c7FB3p03/6Szug1HW1DfTWy3jZ Qf2aOxmmEZc2RTOZpnyxo+YNVPriuUg10iHEUTnTUCH7YfdtnKb3iLiuy4pKTbp5KvThjgjAr z+Ni5v8AbKX4lAq9 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > Cc: Pablo Neira Ayuso > > Cc: Patrick McHardy > > Cc: Jozsef Kadlecsik > > Cc: netfilter-devel@vger.kernel.org > > Cc: coreteam@netfilter.org > > Acked-by: Pablo Neira Ayuso 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