From patchwork Fri Nov 10 15:37:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10053367 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 3DE2060631 for ; Fri, 10 Nov 2017 15:38:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D70E2B372 for ; Fri, 10 Nov 2017 15:38:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2219A2B376; Fri, 10 Nov 2017 15:38:50 +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 A36102B372 for ; Fri, 10 Nov 2017 15:38:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753374AbdKJPig (ORCPT ); Fri, 10 Nov 2017 10:38:36 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:58152 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753146AbdKJPhu (ORCPT ); Fri, 10 Nov 2017 10:37:50 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MWjbX-1ekRYk2TTH-00XqFL; Fri, 10 Nov 2017 16:37:33 +0100 From: Arnd Bergmann To: Anil Gurumurthy , Sudarsana Kalluru , "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, y2038@lists.linaro.org, hch@lst.de, hare@suse.com, jthumshirn@suse.de, Arnd Bergmann Subject: [PATCH 6/7] scsi: bfa: try to sanitize vendor netlink events Date: Fri, 10 Nov 2017 16:37:14 +0100 Message-Id: <20171110153715.1929456-7-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20171110153715.1929456-1-arnd@arndb.de> References: <20171110153715.1929456-1-arnd@arndb.de> X-Provags-ID: V03:K0:F+ZmV3vkh9+pIezdX/G6DQPShDK66QHv4SUZGh4JAhigcmX/WCk beupxNC1blBzU5Dz99JFx9RJW3h7N0R4bmPBFYrFFQvdJoOGRCWJMRwFHJwkYkMLtHStHrk PCzikwUDOqCXutfcOTRU6LKamVHazFJP0xmey5Pe4Pm61HWNVWPAQaUjygVDCBUu+JzSyTP Mp0v0ulletjNSNIGSekuQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:ETXCMT/dZBI=:Em6yaPe1AOD9d0LIXJH9No CWoWle67bsmaMmwHlCI3h0eUfKZyYXC2tLJndCfXZ5huo00Y7zodJ1L1FZTpFHwl06vEU/uMR zp2YiUW3hqUxQXiYQilzBnew6AHkayCEZauI+T9EavOAHeMAFSbbHGqpIaDB5/SwRF261j1NW ah1OL/lcR9tyB+BZiSAYgoJFmoXd9gu45D5qeskBo70rAgAMibjlBpezlabikLCnAApZ0zv7r odcjPzrkfP8Q7M5/LgqhrjLQKcDKoxRmE6XRZ3SG938/QunORZ6jF5p+2hqEZkk0ncjabJUAN ZjMNa/7XKo24uVNookG3ZqAMMnVzaMtix4SyTiysERSi2D9ko4gQr3tl6riTNip2BlVn2Q4wC 2nMPlqUx/aLXgV3vOEsqgQSypJABnXIUEaZExb16kgg0LJ+fE6Xsg/pXW+7fbsY7LfaGGvvwZ KnhuaIGo6qGvrU4Dpq9XZEo8K7Yu3oGexW8292VJnqr7wvedBwfaLxuDN3fJ9baSsD3XB9viL 7FxUOvaLbXk9DqFAUhvT8PkadVQqy3WioT42kMSn9uW7Qd0wDX0/sS40Uvw3sKATrK0FiVAdr vvM1frrWCiJFQGgNl/ZxQW2DHt8Ryjs7/4SFjIPsI4JXi6HheKr5ZQuqAEkZF5o6kD8SkzCv/ 4V0eniGq6a3w8MAlKKa4v1czsnUqrbykiZ1iyVpkLJYKhfQBoLK6ugrUKJ8wz/ZpJvOhgALTL j6o1nC/7s5c4bVJ1vcAJ/Y3ehXbpLkeuHW+giA== 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 bfa_aen_entry_s is passed to user space in a netlink message, but is defined using a 'struct timeval' and an 'enum' that are not only different between architectures, but also between 32-bit user space and 64-bit kernels they may run on, as well as depending on the particular C library that defines timeval. This changes the in-kernel definition to no longer use the timeval type directly but instead use two open-coded 'unsigned long' members. This keeps the existing ABI, but making the variable unsigned also helps make it work after y2038, until it overflows in 2106. Since the macro becomes overly complex at this point, I'm changing it to an inline function for readability. I'm not changing the 32-bit user-space ABI at this point, to keep the changes separate, I deally this would be defined using the same binary layout for all architectures. Signed-off-by: Arnd Bergmann --- drivers/scsi/bfa/bfa_defs_svc.h | 3 ++- drivers/scsi/bfa/bfad_im.h | 32 ++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/bfa/bfa_defs_svc.h b/drivers/scsi/bfa/bfa_defs_svc.h index e81707f938cb..df1e874015c4 100644 --- a/drivers/scsi/bfa/bfa_defs_svc.h +++ b/drivers/scsi/bfa/bfa_defs_svc.h @@ -1455,7 +1455,8 @@ struct bfa_aen_entry_s { enum bfa_aen_category aen_category; u32 aen_type; union bfa_aen_data_u aen_data; - struct timeval aen_tv; + unsigned long aen_tv_sec; + unsigned long aen_tv_usec; u32 seq_num; u32 bfad_num; }; diff --git a/drivers/scsi/bfa/bfad_im.h b/drivers/scsi/bfa/bfad_im.h index c81ec2a77ef5..7f7616c52814 100644 --- a/drivers/scsi/bfa/bfad_im.h +++ b/drivers/scsi/bfa/bfad_im.h @@ -131,16 +131,28 @@ struct bfad_im_s { } while (0) /* post fc_host vendor event */ -#define bfad_im_post_vendor_event(_entry, _drv, _cnt, _cat, _evt) do { \ - do_gettimeofday(&(_entry)->aen_tv); \ - (_entry)->bfad_num = (_drv)->inst_no; \ - (_entry)->seq_num = (_cnt); \ - (_entry)->aen_category = (_cat); \ - (_entry)->aen_type = (_evt); \ - if ((_drv)->bfad_flags & BFAD_FC4_PROBE_DONE) \ - queue_work((_drv)->im->drv_workq, \ - &(_drv)->im->aen_im_notify_work); \ -} while (0) +static inline void bfad_im_post_vendor_event(struct bfa_aen_entry_s *entry, + struct bfad_s *drv, int cnt, + enum bfa_aen_category cat, + enum bfa_ioc_aen_event evt) +{ + struct timespec64 ts; + + ktime_get_real_ts64(&ts); + /* + * 'unsigned long aen_tv_sec' overflows in y2106 on 32-bit + * architectures, or in 2038 if user space interprets it + * as 'signed'. + */ + entry->aen_tv_sec = ts.tv_sec; + entry->aen_tv_usec = ts.tv_nsec / NSEC_PER_USEC; + entry->bfad_num = drv->inst_no; + entry->seq_num = cnt; + entry->aen_category = cat; + entry->aen_type = evt; + if (drv->bfad_flags & BFAD_FC4_PROBE_DONE) + queue_work(drv->im->drv_workq, &drv->im->aen_im_notify_work); +} struct Scsi_Host *bfad_scsi_host_alloc(struct bfad_im_port_s *im_port, struct bfad_s *);