From patchwork Fri Nov 10 15:58:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10053403 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4D3A260365 for ; Fri, 10 Nov 2017 15:59:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FFC82B2AB for ; Fri, 10 Nov 2017 15:59:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 34AA72B2B0; Fri, 10 Nov 2017 15:59:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA39D2B2AB for ; Fri, 10 Nov 2017 15:59:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753241AbdKJP71 (ORCPT ); Fri, 10 Nov 2017 10:59:27 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:64187 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752831AbdKJP70 (ORCPT ); Fri, 10 Nov 2017 10:59:26 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0Luaps-1fCbyb3k12-00zp4q; Fri, 10 Nov 2017 16:58:42 +0100 From: Arnd Bergmann To: Adam Radford , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , Sumit Saxena , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] scsi: 3ware: fix 32-bit time calculations Date: Fri, 10 Nov 2017 16:58:25 +0100 Message-Id: <20171110155840.1941250-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:5NNgyRlEH1VpKYg/dNzJfWlbFa35WvhH1ZyHkDNfoUkTghU5YPR 5nUxJB7ZRn0wxReVXQ7OiTA+BLiVvS7zW4cbX0BWxfUUF+qEshV+wXAiGiVBCQuuF64qHnO 6Ws9RIW+zLgpY2UZRdjyfjRa60n198sZB557OHxqDnF5ce3pw+JbtyqmSzmSK3rDJNPmA0f u/Pe3xDlzBM3raxnQSMKA== X-UI-Out-Filterresults: notjunk:1; V01:K0:IoWl24KxsYU=:x5xuZ8f211toj2vqXQf0/P wWuMRrnRLrJc2pUuRrHyqV0p6tVj90YggAfdxzkvgIVhF0bHQtL84bdRIzMB83h8jtUkEm+Ef CvArTPUAnalLU2RuNqyuRquh2dqePFfExnxIDDzN2KTwAIQbfYvuqsQjofoUNxyrw1NyCZ/OB 8FUjEfwpEfvs5ch779F5HpAsbp2j7Qz4FF8fxnSR5rEh1TkLTmq7zABuBSrc85ohQfDFpJaWd FTsWPDigrzTzqiPKhEKTlZRWsExWnbTQqfK6KlNaUNx4/bYDnlyrrYjbd/60EQFIcil/ze5W/ ZkTEbTjOxu6v1f0dB6/372PBIHcGoUizeS/FsfsHn2Qn5R5umoSzczsWsa4Om0wYtReyYXDNW 1HpDwRaHdvTR66fM9mG8SGj8/5lWMhJkcLa82ShA4UcctyJHf1sFvNfUG73eT3NfXRFahJJsk BgucPBnxunlgBuz8NzYFpzLpV0A+WWVQzRC/phIR56dab8fUqXQJLrA41YpTQrx6q+6efvIEX YcokiutspcbhnL0E74KlKP0vKlV/z5jZmEIQX41Ckt2uT8Rry/+YYUJQFtmMzOLQmp5G031iG ooJmtywdo2FRZxqCf3DGv9S0XIDo62vuGgRrdJldEk0vYXCM2l/BkUTWwCwjyqp6B+XU1DW2P uD8i1kPMERHToVSW9fJTMhCiK+S0B75fG5N97bhNL1f41fhHpGO7WNqRytByarbwxn/gxCnTi ll5/O8UknAGWM2dxtilbgwFm8xslxwAJNgS0mA== Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP twl_aen_queue_event/twa_aen_queue_event, we use do_gettimeofday() to read the lower 32 bits of the current time in seconds, to pass them to the TW_IOCTL_GET_NEXT_EVENT ioctl or the 3ware_aen_read sysfs file. This will overflow on all architectures in year 2106, there is not much we can do about that without breaking the ABI. User space has 90 years to learn to deal with it, so it's probably ok. I'm changing it to use ktime_get_real_seconds() with a comment to document what happens when. Signed-off-by: Arnd Bergmann Acked-by: Adam Radford --- drivers/scsi/3w-9xxx.c | 5 ++--- drivers/scsi/3w-sas.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index 00e7968a1d70..cb9af3f7b653 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c @@ -369,7 +369,6 @@ static int twa_aen_drain_queue(TW_Device_Extension *tw_dev, int no_check_reset) static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header) { u32 local_time; - struct timeval time; TW_Event *event; unsigned short aen; char host[16]; @@ -392,8 +391,8 @@ static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H memset(event, 0, sizeof(TW_Event)); event->severity = TW_SEV_OUT(header->status_block.severity__reserved); - do_gettimeofday(&time); - local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60)); + /* event->time_stamp_sec overflows in y2106 */ + local_time = (u32)(ktime_get_real_seconds() - (sys_tz.tz_minuteswest * 60)); event->time_stamp_sec = local_time; event->aen_code = aen; event->retrieved = TW_AEN_NOT_RETRIEVED; diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index b150e131b2e7..c283fdb3cb24 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c @@ -221,7 +221,6 @@ static char *twl_aen_severity_lookup(unsigned char severity_code) static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header) { u32 local_time; - struct timeval time; TW_Event *event; unsigned short aen; char host[16]; @@ -240,8 +239,8 @@ static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H memset(event, 0, sizeof(TW_Event)); event->severity = TW_SEV_OUT(header->status_block.severity__reserved); - do_gettimeofday(&time); - local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60)); + /* event->time_stamp_sec overflows in y2106 */ + local_time = (u32)(ktime_get_real_seconds() - (sys_tz.tz_minuteswest * 60)); event->time_stamp_sec = local_time; event->aen_code = aen; event->retrieved = TW_AEN_NOT_RETRIEVED;