[v2,07/12] nfsd: use time64_t in nfsd_proc_setattr() check

Message ID	20191213141046.1770441-8-arnd@arndb.de
State	Accepted
Commit	b6356d420296e4fd5045ab3b404bfeb9f659ce08
Headers	show Delivered-To: patch@linaro.org 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; From: Arnd Bergmann <arnd@arndb.de> To: "J. Bruce Fields" <bfields@fieldses.org>, Chuck Lever <chuck.lever@oracle.com> Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, y2038@lists.linaro.org, Arnd Bergmann <arnd@arndb.de> Subject: [PATCH v2 07/12] nfsd: use time64_t in nfsd_proc_setattr() check Date: Fri, 13 Dec 2019 15:10:41 +0100 Message-Id: <20191213141046.1770441-8-arnd@arndb.de> In-Reply-To: <20191213141046.1770441-1-arnd@arndb.de> References: <20191213141046.1770441-1-arnd@arndb.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	nfsd: avoid 32-bit time_t \| expand [v2,00/12] nfsd: avoid 32-bit time_t [v2,01/12] nfsd: use ktime_get_seconds() for timestamps [v2,02/12] nfsd: print 64-bit timestamps in client_info_show [v2,03/12] nfsd: handle nfs3 timestamps as unsigned [v2,04/12] nfsd: use timespec64 in encode_time_delta [v2,05/12] nfsd: make 'boot_time' 64-bit wide [v2,06/12] nfsd: pass a 64-bit guardtime to nfsd_setattr() [v2,07/12] nfsd: use time64_t in nfsd_proc_setattr() check [v2,08/12] nfsd: fix delay timer on 32-bit architectures [v2,09/12] nfsd: fix jiffies/time_t mixup in LRU list [v2,10/12] nfsd: use boottime for lease expiry alculation [v2,11/12] nfsd: use ktime_get_real_seconds() in nfs4_verifier [v2,12/12] nfsd: remove nfs4_reset_lease() declarations

Message ID

20191213141046.1770441-8-arnd@arndb.de

State

Accepted

Commit

b6356d420296e4fd5045ab3b404bfeb9f659ce08

Headers

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; 
From: Arnd Bergmann <arnd@arndb.de>
To: "J. Bruce Fields" <bfields@fieldses.org>,
	Chuck Lever <chuck.lever@oracle.com>
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
	y2038@lists.linaro.org, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH v2 07/12] nfsd: use time64_t in nfsd_proc_setattr() check
Date: Fri, 13 Dec 2019 15:10:41 +0100
Message-Id: <20191213141046.1770441-8-arnd@arndb.de>
In-Reply-To: <20191213141046.1770441-1-arnd@arndb.de>
References: <20191213141046.1770441-1-arnd@arndb.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

nfsd: avoid 32-bit time_t | expand

Commit Message

Arnd Bergmann Dec. 13, 2019, 2:10 p.m. UTC

Change to time64_t and ktime_get_real_seconds() to make the
logic work correctly on 32-bit architectures beyond 2038.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 fs/nfsd/nfsproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.0

diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index aa013b736073..b25c90be29fb 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -94,7 +94,7 @@  nfsd_proc_setattr(struct svc_rqst *rqstp)
 		 * Solaris, at least, doesn't seem to care what the time
 		 * request is.  We require it be within 30 minutes of now.
 		 */
-		time_t delta = iap->ia_atime.tv_sec - get_seconds();
+		time64_t delta = iap->ia_atime.tv_sec - ktime_get_real_seconds();
 
 		nfserr = fh_verify(rqstp, fhp, 0, NFSD_MAY_NOP);
 		if (nfserr)

[v2,07/12] nfsd: use time64_t in nfsd_proc_setattr() check

Commit Message

Patch