From patchwork Sun Jul 30 22:30:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9870713 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 ACDCF60353 for ; Sun, 30 Jul 2017 22:31:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F0DE28575 for ; Sun, 30 Jul 2017 22:31:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 940812857B; Sun, 30 Jul 2017 22:31:39 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 240ED28575 for ; Sun, 30 Jul 2017 22:31:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751840AbdG3WbF (ORCPT ); Sun, 30 Jul 2017 18:31:05 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35134 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751633AbdG3WaS (ORCPT ); Sun, 30 Jul 2017 18:30:18 -0400 Received: by mail-pf0-f193.google.com with SMTP id q85so24569266pfq.2; Sun, 30 Jul 2017 15:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=j+ljMCa9iopfcLGLm7E7PmfZ+y+9KHioKleN2IU4g5g=; b=oJ/ugDHJwxYCFuEe4ZfiZTuNpsyQJyZ2O1LTdOEFP60XiqmaPdastBrY20HFYOC/Qn nL2Od6HXdnKNFIay6rWYWLP83NNURgXoHqDE5v3OPArDZGjbftbM/RKE8CyCsIZI7Z5d Sg6BG3fBnvWzEG1KcRgQjpstLyQsX0YSzZz2n7HbbjytY+xGSNZ1V3qAgw6JTSzFGlnD bjXmI/G3SSwuo2+7+udXOLALxlPlUeuADlMRo5/aEpU03/eFsmlmob+Pa6nYVkQPs6Di KxwITB0JRIAMjvWwq7/SZoUvEmu4pISJ1D7BpIQc9YHF3ijOpxxharSgWUipTLXtMYCq itbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=j+ljMCa9iopfcLGLm7E7PmfZ+y+9KHioKleN2IU4g5g=; b=pNVFmMcmjGblxK9XO13gqgrktOH6BXd1Hq94mjQdM76WUiwEKmlC5I9uhU8ZIWwWUu rnc55VHsN6ODBQuMTmjTBc0jYmMDu3w+A/zHHeCpzJZiOBIVx4Z8eDqf8sH569LLE8xZ +GKl/evj0bX/b/W4idShKqBvd5LswXeCtJugnBmp16hynE2OD1akGW3REQsQzBfhQLDn FfKXsP3Nl5ua1CR79yjwSaJIBHNzyZMEXzcJ9e5PdtDnpiPHgBX+RDUFqLZWDzMAIhbH aX/gQDXyxishITA4FqfmOPSvr2rxT6AIwXJCUmeCiIM39IIImHz0YLzgNhOsXV7VqlY+ JzhQ== X-Gm-Message-State: AIVw112Y6CIdl1t9D8dJFv3iZJi6NkUaUtaGU+FdzPCrxtd7iikXe6XZ TXvSlRU77fje0g== X-Received: by 10.98.27.206 with SMTP id b197mr13687075pfb.149.1501453818198; Sun, 30 Jul 2017 15:30:18 -0700 (PDT) Received: from localhost.localdomain ([2601:647:5000:6620:b1bb:905a:190e:8c7e]) by smtp.gmail.com with ESMTPSA id b24sm47763365pfh.53.2017.07.30.15.30.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Jul 2017 15:30:17 -0700 (PDT) From: Deepa Dinamani To: viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, arnd@arndb.de, y2038@lists.linaro.org Subject: [PATCH v2 4/6] ipc: sem: Make sem_array timestamps y2038 safe Date: Sun, 30 Jul 2017 15:30:04 -0700 Message-Id: <20170730223006.32661-5-deepa.kernel@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170730223006.32661-1-deepa.kernel@gmail.com> References: <20170730223006.32661-1-deepa.kernel@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP time_t is not y2038 safe. Replace all uses of time_t by y2038 safe time64_t. Similarly, replace the calls to get_seconds() with y2038 safe ktime_get_real_seconds(). Note that this preserves fast access on 64 bit systems, but 32 bit systems need sequence counters. The syscall interface themselves are not changed as part of the patch. They will be part of a different series. Signed-off-by: Deepa Dinamani --- include/linux/sem.h | 3 ++- ipc/sem.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/linux/sem.h b/include/linux/sem.h index 9edec926e9d9..8012ce99f72f 100644 --- a/include/linux/sem.h +++ b/include/linux/sem.h @@ -4,6 +4,7 @@ #include #include #include +#include #include struct task_struct; @@ -11,7 +12,7 @@ struct task_struct; /* One sem_array data structure for each set of semaphores in the system. */ struct sem_array { struct kern_ipc_perm sem_perm; /* permissions .. see ipc.h */ - time_t sem_ctime; /* last change time */ + time64_t sem_ctime; /* last change time */ struct sem *sem_base; /* ptr to first semaphore in array */ struct list_head pending_alter; /* pending operations */ /* that alter the array */ diff --git a/ipc/sem.c b/ipc/sem.c index b41cd00d104c..b1ca22844b98 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -518,7 +518,7 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params) INIT_LIST_HEAD(&sma->pending_const); INIT_LIST_HEAD(&sma->list_id); sma->sem_nsems = nsems; - sma->sem_ctime = get_seconds(); + sma->sem_ctime = ktime_get_real_seconds(); id = ipc_addid(&sem_ids(ns), &sma->sem_perm, ns->sc_semmni); if (id < 0) { @@ -1169,14 +1169,14 @@ static unsigned long copy_semid_to_user(void __user *buf, struct semid64_ds *in, } } -static time_t get_semotime(struct sem_array *sma) +static time64_t get_semotime(struct sem_array *sma) { int i; - time_t res; + time64_t res; res = sma->sem_base[0].sem_otime; for (i = 1; i < sma->sem_nsems; i++) { - time_t to = sma->sem_base[i].sem_otime; + time64_t to = sma->sem_base[i].sem_otime; if (to > res) res = to; @@ -1316,7 +1316,7 @@ static int semctl_setval(struct ipc_namespace *ns, int semid, int semnum, curr->semval = val; curr->sempid = task_tgid_vnr(current); - sma->sem_ctime = get_seconds(); + sma->sem_ctime = ktime_get_real_seconds(); /* maybe some queued-up processes were waiting for this */ do_smart_update(sma, NULL, 0, 0, &wake_q); sem_unlock(sma, -1); @@ -1442,7 +1442,7 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum, for (i = 0; i < nsems; i++) un->semadj[i] = 0; } - sma->sem_ctime = get_seconds(); + sma->sem_ctime = ktime_get_real_seconds(); /* maybe some queued-up processes were waiting for this */ do_smart_update(sma, NULL, 0, 0, &wake_q); err = 0; @@ -1552,7 +1552,7 @@ static int semctl_down(struct ipc_namespace *ns, int semid, err = ipc_update_perm(&semid64->sem_perm, ipcp); if (err) goto out_unlock0; - sma->sem_ctime = get_seconds(); + sma->sem_ctime = ktime_get_real_seconds(); break; default: err = -EINVAL; @@ -2297,7 +2297,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it) { struct user_namespace *user_ns = seq_user_ns(s); struct sem_array *sma = it; - time_t sem_otime; + time64_t sem_otime; /* * The proc interface isn't aware of sem_lock(), it calls @@ -2310,7 +2310,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it) sem_otime = get_semotime(sma); seq_printf(s, - "%10d %10d %4o %10u %5u %5u %5u %5u %10lu %10lu\n", + "%10d %10d %4o %10u %5u %5u %5u %5u %10llu %10llu\n", sma->sem_perm.key, sma->sem_perm.id, sma->sem_perm.mode, @@ -2319,8 +2319,8 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it) from_kgid_munged(user_ns, sma->sem_perm.gid), from_kuid_munged(user_ns, sma->sem_perm.cuid), from_kgid_munged(user_ns, sma->sem_perm.cgid), - sem_otime, - sma->sem_ctime); + (unsigned long long) sem_otime, + (unsigned long long) sma->sem_ctime); complexmode_tryleave(sma);