nfsd: restrict rd_maxcount to svc_max_payload in nfsd_encode_readdir
authorScott Mayhew <smayhew@redhat.com>
Mon, 7 May 2018 13:01:08 +0000 (09:01 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 3 Jul 2018 09:23:16 +0000 (11:23 +0200)
commit40d79a61957a7d59b079d30fbbc5e51c3b9b239a
treec10d27e7d9c26c316e959669cf80dd4e59f0f3f9
parentdc00f08645be1f6a1319af6c6c1117137f787efc
nfsd: restrict rd_maxcount to svc_max_payload in nfsd_encode_readdir

commit 9c2ece6ef67e9d376f32823086169b489c422ed0 upstream.

nfsd4_readdir_rsize restricts rd_maxcount to svc_max_payload when
estimating the size of the readdir reply, but nfsd_encode_readdir
restricts it to INT_MAX when encoding the reply.  This can result in log
messages like "kernel: RPC request reserved 32896 but used 1049444".

Restrict rd_dircount similarly (no reason it should be larger than
svc_max_payload).

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfsd/nfs4xdr.c