From patchwork Wed Apr 25 16:03:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 134359 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1051949lji; Wed, 25 Apr 2018 09:05:58 -0700 (PDT) X-Google-Smtp-Source: AIpwx48UVKAOePoErf173jylJrhrHmTo6XazFIlMS62Glox7yjF3bdeJ3Ask+TMxEHMS40qpfZob X-Received: by 2002:a17:902:3181:: with SMTP id x1-v6mr29945479plb.198.1524672357962; Wed, 25 Apr 2018 09:05:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524672357; cv=none; d=google.com; s=arc-20160816; b=Q+pm32ZSIQReHxZqqZHVjjn1y9dP/QFa10QxEnsMqQ4FD0WCN+XzPsbcoTNRxBhM1V ZCK4xtuav2BGCWgBywPK2EVBAIiysF14tC2vYjmx7tHYXtWPalHC2y6xM1zHuylYt5tk avP36Eqbb0/0o7cheWmS2HothpHrW4wHtKDFgS+R2Ip3jfFSBfSMffHaK7sohAdiRtCt 4xzLVi4Rl5w6GD7gXuBp2OrBS+G5ZbsGTKmwtpUr012Qx5zSHD0vJP107mVnObAI73T/ uoj34mu5Xv8kko+bO6S20T2y134FktdiA56iL60b97fWQLDxrxZAU1uDyOArujZnbMS9 OGWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=WxtQMRQVO3QhYAd3QOXm5R4FIlC3dN62tAdEZpRCUg4=; b=IH9TOwx+DPBrXSsXp7qgoXgcVoQ7KZyWDwtCl16tF2PctwVFSan3VFr8Ce+gvyw5wE wDCI0hL93cGtdtzUSDs0wUYU/2MWbbSo9XZoWBGCAypSNuM05Nx2t26XCN9TLFl5P0cd 8POQTPXrO+Kd4S4Sj9LAI6IDMzVpMdx96KDhl6LIqzS/8kYTueOvWqhuYLxnxRr1entG KaONyb2n1oQa4Yp7fEMfuLPs6Ty9TxtKnt+Og8J5aTgZFxWwH3swyUoXehlC7sAngse4 tmrbOFgulOTrYkskfm1RASkHbJoXUepTHw/CUAjqupvlQ47H1oaw52C8XyTPiUwxKQJr QGQw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z187si9171792pgd.646.2018.04.25.09.05.50; Wed, 25 Apr 2018 09:05:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755895AbeDYQF3 (ORCPT + 29 others); Wed, 25 Apr 2018 12:05:29 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:39363 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755453AbeDYQFO (ORCPT ); Wed, 25 Apr 2018 12:05:14 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MhDJh-1eyWy22xQf-00MHwL; Wed, 25 Apr 2018 18:03:39 +0200 From: Arnd Bergmann To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , linux-api@vger.kernel.org, linux-arch@vger.kernel.org, libc-alpha@sourceware.org, tglx@linutronix.de, netdev@vger.kernel.org, deepa.kernel@gmail.com, viro@zeniv.linux.org.uk, albert.aribaud@3adev.fr, Peter Zijlstra , Darren Hart , "Eric W. Biederman" , Dominik Brodowski Subject: [PATCH 15/17] y2038: signal: Change rt_sigtimedwait to use __kernel_timespec Date: Wed, 25 Apr 2018 18:03:09 +0200 Message-Id: <20180425160311.2718314-16-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180425160311.2718314-1-arnd@arndb.de> References: <20180425160311.2718314-1-arnd@arndb.de> X-Provags-ID: V03:K1:igsf2P3DT0IyMA/Ng6FqZQct7nSsdNtSCltmMXXdHoWd+BI90Y0 Hzwr1NPoV3JWOW0ImwJW9Bsb0VGPqW+srf4lhuWudCzoOCqkx+9VkCK/2DoP7XO+ZsWfEKj 97i+9xD2U68JEL1LkrUY2OWAr+K6r/EnBazhh8iuKmE6wrbKA00s2ilqOj5Z0qkur/igkz9 LMGb+QEIst4j8y0BBnVBw== X-UI-Out-Filterresults: notjunk:1; V01:K0:65jbx0DJbIk=:KWKqWzqjhcBy1utrBqYdqt mgvLBj5/KSyO/c38AMRkPzgZsb5LFL5gdXbUNrna6LXJ+ROGyGzo4/FcesmTY58V8u2IRDcv8 b/67hERSiO3Rn6qjF2BovO6tydFk3i1muhZeWVwaNUL6R7GGZtTnEOl/qTCD5t3Hjq4LNQKiv 9nzInNlEV9tJ0ktysDRznjvGMDU4TOp9/B2MqGbhscjNNH2AlxoF5enjBfDZCI0CqXI5j5D4n 9D68PL/jwbQ0J8trtz+Q9z/9tOtmuqXymPvpRK9mtmXQWk37tpyrWpyQJ6syXI4ew7E2ifEhJ KvWTGFErQ2Za94+Aesp+qr5ExvOQVP/3t/DsmCXM8eSpPMD2W8eCB86XV6nA0g2jd50bhupOz sMSp+PkQkgMsE7pyS/yiUOor0pY7Mw4APyj0KUsqzQ7ojiX7hERF6JN4dsYkE/fdwHU+EHduj M4eHPuEa4uz3kItFi86W8rLDdqCeXrsG+US/8wlia40fTazLmbRTPCP2+EFqHvsnzz0ZJtoE/ fA0HuNwy5RMhkaXF6CvHdqb99xCpoNLwC8AchEcFYLjQtmACWeIwAmuKYvHAX1mAS7fi4N2+E OrCeMr86o2zqp1wUa7yxw3t5QSijelOva2dCkul2AVi6BjxSYBX9JsfZ301ArfdJtz6oIsoF+ p2JpfShxx+IpaU/QewNrp/rv2Q2Fg68qhqZ6RpV9j8mkXUzvDN8mDbXfkWJJvXNepk2E= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This changes sys_rt_sigtimedwait() to use get_timespec64(), changing the timeout type to __kernel_timespec, which will be changed to use a 64-bit time_t in the future. Since the do_sigtimedwait() core function changes, we also have to modify the compat version of this system call in the same way. Signed-off-by: Arnd Bergmann --- include/linux/syscalls.h | 2 +- kernel/signal.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) -- 2.9.0 diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index eaa32317f573..a756ab42894f 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -622,7 +622,7 @@ asmlinkage long sys_rt_sigprocmask(int how, sigset_t __user *set, asmlinkage long sys_rt_sigpending(sigset_t __user *set, size_t sigsetsize); asmlinkage long sys_rt_sigtimedwait(const sigset_t __user *uthese, siginfo_t __user *uinfo, - const struct timespec __user *uts, + const struct __kernel_timespec __user *uts, size_t sigsetsize); asmlinkage long sys_rt_sigqueueinfo(pid_t pid, int sig, siginfo_t __user *uinfo); diff --git a/kernel/signal.c b/kernel/signal.c index d4ccea599692..d8d68a9556ae 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -3113,7 +3113,7 @@ int copy_siginfo_from_user32(struct siginfo *to, * @ts: upper bound on process time suspension */ static int do_sigtimedwait(const sigset_t *which, siginfo_t *info, - const struct timespec *ts) + const struct timespec64 *ts) { ktime_t *to = NULL, timeout = KTIME_MAX; struct task_struct *tsk = current; @@ -3121,9 +3121,9 @@ static int do_sigtimedwait(const sigset_t *which, siginfo_t *info, int sig, ret = 0; if (ts) { - if (!timespec_valid(ts)) + if (!timespec64_valid(ts)) return -EINVAL; - timeout = timespec_to_ktime(*ts); + timeout = timespec64_to_ktime(*ts); to = &timeout; } @@ -3171,11 +3171,12 @@ static int do_sigtimedwait(const sigset_t *which, siginfo_t *info, * @sigsetsize: size of sigset_t type */ SYSCALL_DEFINE4(rt_sigtimedwait, const sigset_t __user *, uthese, - siginfo_t __user *, uinfo, const struct timespec __user *, uts, + siginfo_t __user *, uinfo, + const struct __kernel_timespec __user *, uts, size_t, sigsetsize) { sigset_t these; - struct timespec ts; + struct timespec64 ts; siginfo_t info; int ret; @@ -3187,7 +3188,7 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const sigset_t __user *, uthese, return -EFAULT; if (uts) { - if (copy_from_user(&ts, uts, sizeof(ts))) + if (get_timespec64(&ts, uts)) return -EFAULT; } @@ -3207,7 +3208,7 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, compat_sigset_t __user *, uthese, struct compat_timespec __user *, uts, compat_size_t, sigsetsize) { sigset_t s; - struct timespec t; + struct timespec64 t; siginfo_t info; long ret; @@ -3218,7 +3219,7 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, compat_sigset_t __user *, uthese, return -EFAULT; if (uts) { - if (compat_get_timespec(&t, uts)) + if (compat_get_timespec64(&t, uts)) return -EFAULT; }