diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2019-11-03 22:32:20 +0100 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@redhat.com> | 2019-12-19 17:46:08 -0500 |
| commit | 2561c92b12f4f4e386d453556685f75775c0938b (patch) | |
| tree | 1693142e2fddadde659eec8aef5e11ceb02b7bb3 /fs/nfsd/nfs4layouts.c | |
| parent | nfsd: use time64_t in nfsd_proc_setattr() check (diff) | |
| download | linux-dev-2561c92b12f4f4e386d453556685f75775c0938b.tar.xz linux-dev-2561c92b12f4f4e386d453556685f75775c0938b.zip | |
nfsd: fix delay timer on 32-bit architectures
The nfsd4_cb_layout_done() function takes a 'time_t' value,
multiplied by NSEC_PER_SEC*2 to get a nanosecond value.
This works fine on 64-bit architectures, but on 32-bit, any
value over 1 second results in a signed integer overflow
with unexpected results.
Cast one input to a 64-bit type in order to produce the
same result that we have on 64-bit architectures, regarless
of the type of nfsd4_lease.
Fixes: 6b9b21073d3b ("nfsd: give up on CB_LAYOUTRECALLs after two lease periods")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4layouts.c')
| -rw-r--r-- | fs/nfsd/nfs4layouts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index 2681c70283ce..e12409eca7cc 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -675,7 +675,7 @@ nfsd4_cb_layout_done(struct nfsd4_callback *cb, struct rpc_task *task) /* Client gets 2 lease periods to return it */ cutoff = ktime_add_ns(task->tk_start, - nn->nfsd4_lease * NSEC_PER_SEC * 2); + (u64)nn->nfsd4_lease * NSEC_PER_SEC * 2); if (ktime_before(now, cutoff)) { rpc_delay(task, HZ/100); /* 10 mili-seconds */ |