diff options
author | J. Bruce Fields <bfields@redhat.com> | 2015-01-20 11:51:26 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2015-01-23 10:29:11 -0500 |
commit | bbc7f33ac6ff6f48709ce892aa906ddb68b34517 (patch) | |
tree | 6b1a31a7692b5f5010a06479ef74dd713a6eac0f /fs/nfsd | |
parent | a97c331f9aa9080706a7835225d9d82e832e0bb6 (diff) | |
download | op-kernel-dev-bbc7f33ac6ff6f48709ce892aa906ddb68b34517.zip op-kernel-dev-bbc7f33ac6ff6f48709ce892aa906ddb68b34517.tar.gz |
nfsd: fix year-2038 nfs4 state problem
Someone with a weird time_t happened to notice this, it shouldn't really
manifest till 2038. It may not be our ownly year-2038 problem.
Reported-by: Aaron Pace <Aaron.Pace@alcatel-lucent.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4state.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index f924f06..1f4b85b 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1508,7 +1508,12 @@ unhash_session(struct nfsd4_session *ses) static int STALE_CLIENTID(clientid_t *clid, struct nfsd_net *nn) { - if (clid->cl_boot == nn->boot_time) + /* + * We're assuming the clid was not given out from a boot + * precisely 2^32 (about 136 years) before this one. That seems + * a safe assumption: + */ + if (clid->cl_boot == (u32)nn->boot_time) return 0; dprintk("NFSD stale clientid (%08x/%08x) boot_time %08lx\n", clid->cl_boot, clid->cl_id, nn->boot_time); |