OSDN Git Service

nfsd: fix delay timer on 32-bit architectures
authorArnd Bergmann <arnd@arndb.de>
Sun, 3 Nov 2019 21:32:20 +0000 (22:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Feb 2020 12:34:13 +0000 (04:34 -0800)
commit70b43a9da1e5c54e80528c7ed911a82cc78df1b7
tree9ff1e8a819e19a6668a1cce2fb825dcc6e42c585
parent48d33701f6cf1d2925b5606eb7e7a0813d53b89c
nfsd: fix delay timer on 32-bit architectures

commit 2561c92b12f4f4e386d453556685f75775c0938b upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfsd/nfs4layouts.c