Message ID | 20191213141046.1770441-12-arnd@arndb.de |
---|---|
State | New |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp691431ile; Fri, 13 Dec 2019 06:11:40 -0800 (PST) X-Google-Smtp-Source: APXvYqyLMx90t5lhXeJ3e7tOiXeI8jEOO0UgC6O2IzHKYud0TagqvSJ4t+iVqJHBKG5J1HeH6pXn X-Received: by 2002:a9d:5c1:: with SMTP id 59mr15101961otd.192.1576246300648; Fri, 13 Dec 2019 06:11:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576246300; cv=none; d=google.com; s=arc-20160816; b=c2FEOgKyCRWyT9C6KImpAw3RYSgF4PQn7Au5ImfUnVics9yoj/pb0VNAxhQPvBeKm9 L2GJrI6UCJvSnDpTPyZeWHZLm1UNXY6wxjX04SKtNh4Izv+dT/WyrZw2r6elvt35KxTd LdkHFbDJQF3lI0r1ESft4EF9jR4vjgzYAfix7+Uh9gyRhVOsUqthGclY5Rqk3HMGKEA0 aM8vcXW7GYyvR5JpERg/vgG0/V+2sWbPd+lMVMKy7/sqMa/SIIl/Pxq8ZuLnVGhy3u0f tD7E09ENiB+047xm7/pJkv9+cBJ5WlgSzYr+BUD+iL2sCpcsjwPuTqIS6DTH4UbzdOOn 5KAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=vK7ZBqast0ydUemX21Dob2PnAFQAK0wM7larYArcNv8=; b=eofpex2WzanqEQ4G36FxO9docQVU1qDFF2yUWcoNE999vMfNyG+mZScw9jpyIw4HhU indTl1F3KxbYoqFFRkj+g+icqkCkpYxokELHMVUuWyeEq9x6lvz7iRJl/zwDLo/xisJj dzD4bJRbtrX5P6ahjP3Ldm+aktTPSZKAGYzcCSrRePDNXucHqNGUVTq6/TaD0domS3NC xFylgsMx4MSQKcCWryPmFRAZX/oozNyi2zLIkDJWTLWJl+o3sztJA5Ba9ilOtOUYkghG dVmv+QrRpkoG48/TAoKrEk3l1f9GGyOYVEhuu7oCERedWAWYB9P1rMSy8juVhC/Vmnsa HKrw== 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: <linux-kernel-owner@vger.kernel.org> Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f16si5135005otp.198.2019.12.13.06.11.40; Fri, 13 Dec 2019 06:11:40 -0800 (PST) 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 S1727812AbfLMOLi (ORCPT <rfc822;christophe.lyon@linaro.org> + 27 others); Fri, 13 Dec 2019 09:11:38 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:36859 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727573AbfLMOLD (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 13 Dec 2019 09:11:03 -0500 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1Mi2BV-1i1js033dh-00e7iJ; Fri, 13 Dec 2019 15:10:57 +0100 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 11/12] nfsd: use ktime_get_real_seconds() in nfs4_verifier Date: Fri, 13 Dec 2019 15:10:45 +0100 Message-Id: <20191213141046.1770441-12-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191213141046.1770441-1-arnd@arndb.de> References: <20191213141046.1770441-1-arnd@arndb.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:Pwg4ldcY+PirxuTk1NxKPR/wF0W7omnIpEhR4gWAXHpGQfencqU 9EjmqFwbCPgYhBby6Q3tH+JCuKvm94AFXcEYbOtHvvBFf6t6QfakjHUFeX/9+wZ0WXOnnAf 7Mj6sSgdq943phWuTRM8iA4/sHo+J04C+yauSKBDSHlxJ9ALUWqh/3hNXScfaod4Jm4H6EW TL/F8Z4OBfXWFGiYY0ojA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:taJeJc826rg=:gsJimcb309nz2tjW+nHMfT GfN+0U2212OBpxgW7egoFIGQ862g/bQvkrGmWwk6BlCUv2H3GGv3fwNrtYdaW/Q+PjOJZmAJk +dK25vCWRztDD50tdguuWnRXx875Hn+wEVYv/6TkFFDaMqRqmNefb4exZPSbWpniFe/lCeZW4 7B/FJM5yqkx3yVZvol7G4KSTp/totkFhFKDnr58T4mvRXNnqzhQeai5WL5hcA6AeONLwFSK6d iIQVqN/4hswZCeNX34EDDwDAKjreQA8NFkfUCLMOO7UBArxETkwq4GJqgh7Fnc6B6zSsrabv3 HrrvQf0GEA1aVb/YDSqqfNhszpmPDG2YhJkrtc813TrR9WJfXCz46oNiJ8vdZ0KSODbvy3Pvn 4SAgh0DX41V96BZuFQOxt6lAlkcjWyFoooimY6kte2bluDN1Fi5RnBjrDDjgtumWA0Yho2LEN H8J2vSmFqLDUI5yGWhnR9qw9aMPe/swv/fuTTNLztVdcTwoFtsxQTGcDQkgHEeawX2UvCL5Zo PQJpcU1Tqdhw6S/gbwImUkqrbfOdpL9InZWTE6UBmtlHX1VpUx/hprHP0MtW+D7gMfZz6J0S4 SCRv1BGJLJMOEl18unsekpH0O56m+qfl+h2S4MX5IxxiMXeuLtz5qYWMpoRqypa0PQfa5LTtd HQybvMPDK334iImyClesbRDePlvRHikkYSfP2RYsvuRgjX77uAP23PrPk568aer4mRcsDM7wB rIeR6WDUn9NFERKrHVuW3Ke+/Sdszf16X9oA6Sf/kN2xVZYxQLKs2PG5VUepNbX1Apchz0nYz 3PSpZK+XI5D/ctMMzt8O3Z6Lrvy2GNRKiDresjBT5jiAADMswqQkrvYa0GQkmC4ec3a++HXgJ 8HHnwgNFBKTuyN4ERjSQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org |
Series |
nfsd: avoid 32-bit time_t
|
expand
|
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6afdef63f6d7..efe3161f6cf7 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2215,7 +2215,7 @@ static void gen_confirm(struct nfs4_client *clp, struct nfsd_net *nn) * This is opaque to client, so no need to byte-swap. Use * __force to keep sparse happy */ - verf[0] = (__force __be32)get_seconds(); + verf[0] = (__force __be32)(u32)ktime_get_real_seconds(); verf[1] = (__force __be32)nn->clverifier_counter++; memcpy(clp->cl_confirm.data, verf, sizeof(clp->cl_confirm.data)); }
gen_confirm() generates a unique identifier based on the current time. This overflows in year 2038, but that is harmless since it generally does not lead to duplicates, as long as the time has been initialized by a real-time clock or NTP. Using ktime_get_boottime_seconds() or ktime_get_seconds() would avoid the overflow, but it would be more likely to result in non-unique numbers. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- fs/nfsd/nfs4state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.0