From patchwork Sun Jul 30 22:30:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9870699 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 4137060353 for ; Sun, 30 Jul 2017 22:30:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3396728575 for ; Sun, 30 Jul 2017 22:30:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 286512857B; Sun, 30 Jul 2017 22:30:42 +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 C256B28575 for ; Sun, 30 Jul 2017 22:30:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751616AbdG3Wa0 (ORCPT ); Sun, 30 Jul 2017 18:30:26 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:37774 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751684AbdG3WaU (ORCPT ); Sun, 30 Jul 2017 18:30:20 -0400 Received: by mail-pg0-f67.google.com with SMTP id k190so13077782pgk.4; Sun, 30 Jul 2017 15:30:20 -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=h6sZLjMD7iW8n8aJq+yfXgjd4Fk5BR3A3SE01Sr53FA=; b=j9lwKm6gSKI8/Wvk51bj5Di385IkZ7sgec/w3G5Q9cqd2sBt/Iiq7hlZsnrO7dc59n piTeZaJBdO7nAIFCCcTaBKxxK59vEk0TZJ4D9OM/voNcFI6C7SPO1rnBTbQMyAUmNEHd n3Gc10etkVhh6PxPVIIJkxJ05PXkm6cOLt4ibkerydcyyi/xDOxlgcp833I21G12/1V6 denM3vb5OikGpCYo0uo7V9kbgqCgiu3+HlZjG6M1ngQ/mjSwC16XBk2BrATzfyBAlRyE 1Rq0eY1ob0pqQp+t9cEPJWhOk3hCHjPrbuidI+L7lstGtjBaAaSyfLprihkNOobU7SOp Kqnw== 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=h6sZLjMD7iW8n8aJq+yfXgjd4Fk5BR3A3SE01Sr53FA=; b=NyI0/6HptusIXbnUnzWcJ92CF/G5ls7mEQQDaKr25oylC+kLWkhP1XPsrUpMBgnx1h E4aAjtdd2gUQf1uloeEj9sBWfmRIZa9XQD+1YTKWpSIG+/3kEfz3L9ms7d6S2bwhGjkU m9nIsn1fGqBgRHbO9GbTQ6/nEMaVC9ha4tNynEyM3nuZrhhpkHMuz1MPMjvMCkWsGWbR /nAVuh0cZz1GWZHkx0ThCUqripHhbeMg8F8liAn3CaN2Dd9QhT5qqrskFQ1ykQe9Hac3 IjSod5y6jUWh2dSpxd/phXX1jBbwjMN0mO+bcvRvXBQv1ZEzY+s4WfefBsIcWx3+TDnV IATQ== X-Gm-Message-State: AIVw112AY6kcWADuVA6vzvLokTQFbSXZ4csEH+3fyvzcIP3xilZMeFAe EZVuNsSahdpZRryW X-Received: by 10.84.210.203 with SMTP id a69mr14813099pli.397.1501453820045; Sun, 30 Jul 2017 15:30:20 -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.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Jul 2017 15:30:19 -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 6/6] utimes: Make utimes y2038 safe Date: Sun, 30 Jul 2017 15:30:06 -0700 Message-Id: <20170730223006.32661-7-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 struct timespec is not y2038 safe on 32 bit machines. Replace timespec with y2038 safe struct timespec64. Note that the patch only changes the internals without modifying the syscall interfaces. This will be part of a separate series. Signed-off-by: Deepa Dinamani --- fs/utimes.c | 23 ++++++++++++----------- include/linux/time.h | 2 +- init/initramfs.c | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/fs/utimes.c b/fs/utimes.c index 6571d8c848a0..51edb9f9507c 100644 --- a/fs/utimes.c +++ b/fs/utimes.c @@ -22,7 +22,7 @@ */ SYSCALL_DEFINE2(utime, char __user *, filename, struct utimbuf __user *, times) { - struct timespec tv[2]; + struct timespec64 tv[2]; if (times) { if (get_user(tv[0].tv_sec, ×->actime) || @@ -44,7 +44,7 @@ static bool nsec_valid(long nsec) return nsec >= 0 && nsec <= 999999999; } -static int utimes_common(const struct path *path, struct timespec *times) +static int utimes_common(const struct path *path, struct timespec64 *times) { int error; struct iattr newattrs; @@ -115,7 +115,7 @@ static int utimes_common(const struct path *path, struct timespec *times) * must be owner or have write permission. * Else, update from *times, must be owner or super user. */ -long do_utimes(int dfd, const char __user *filename, struct timespec *times, +long do_utimes(int dfd, const char __user *filename, struct timespec64 *times, int flags) { int error = -EINVAL; @@ -167,10 +167,11 @@ long do_utimes(int dfd, const char __user *filename, struct timespec *times, SYSCALL_DEFINE4(utimensat, int, dfd, const char __user *, filename, struct timespec __user *, utimes, int, flags) { - struct timespec tstimes[2]; + struct timespec64 tstimes[2]; if (utimes) { - if (copy_from_user(&tstimes, utimes, sizeof(tstimes))) + if ((get_timespec64(&tstimes[0], &utimes[0]) || + get_timespec64(&tstimes[1], &utimes[1]))) return -EFAULT; /* Nothing to do, we must not even check the path. */ @@ -186,7 +187,7 @@ SYSCALL_DEFINE3(futimesat, int, dfd, const char __user *, filename, struct timeval __user *, utimes) { struct timeval times[2]; - struct timespec tstimes[2]; + struct timespec64 tstimes[2]; if (utimes) { if (copy_from_user(×, utimes, sizeof(times))) @@ -224,7 +225,7 @@ SYSCALL_DEFINE2(utimes, char __user *, filename, COMPAT_SYSCALL_DEFINE2(utime, const char __user *, filename, struct compat_utimbuf __user *, t) { - struct timespec tv[2]; + struct timespec64 tv[2]; if (t) { if (get_user(tv[0].tv_sec, &t->actime) || @@ -238,11 +239,11 @@ COMPAT_SYSCALL_DEFINE2(utime, const char __user *, filename, COMPAT_SYSCALL_DEFINE4(utimensat, unsigned int, dfd, const char __user *, filename, struct compat_timespec __user *, t, int, flags) { - struct timespec tv[2]; + struct timespec64 tv[2]; if (t) { - if (compat_get_timespec(&tv[0], &t[0]) || - compat_get_timespec(&tv[1], &t[1])) + if (compat_get_timespec64(&tv[0], &t[0]) || + compat_get_timespec64(&tv[1], &t[1])) return -EFAULT; if (tv[0].tv_nsec == UTIME_OMIT && tv[1].tv_nsec == UTIME_OMIT) @@ -253,7 +254,7 @@ COMPAT_SYSCALL_DEFINE4(utimensat, unsigned int, dfd, const char __user *, filena COMPAT_SYSCALL_DEFINE3(futimesat, unsigned int, dfd, const char __user *, filename, struct compat_timeval __user *, t) { - struct timespec tv[2]; + struct timespec64 tv[2]; if (t) { if (get_user(tv[0].tv_sec, &t[0].tv_sec) || diff --git a/include/linux/time.h b/include/linux/time.h index 4abb32d4c6b8..3d0cd017f0d7 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -178,7 +178,7 @@ extern int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue); extern int do_getitimer(int which, struct itimerval *value); -extern long do_utimes(int dfd, const char __user *filename, struct timespec *times, int flags); +extern long do_utimes(int dfd, const char __user *filename, struct timespec64 *times, int flags); /* * Similar to the struct tm in userspace , but it needs to be here so diff --git a/init/initramfs.c b/init/initramfs.c index 8a532050043f..e64bf7b4c1ca 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -110,7 +110,7 @@ static void __init free_hash(void) static long __init do_utime(char *filename, time_t mtime) { - struct timespec t[2]; + struct timespec64 t[2]; t[0].tv_sec = mtime; t[0].tv_nsec = 0;