sunrpc: correct the computation for page_ptr when truncating
authorFrank Sorenson <sorenson@redhat.com>
Tue, 30 Oct 2018 20:10:40 +0000 (15:10 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Nov 2018 08:19:23 +0000 (09:19 +0100)
commit03c91663c0935fd1c7df5539ff6df65db8f57278
tree3ee6c8e30e9fe6d07f1bfd525015e6a958d2d287
parent401182ae096bfb16693bcfb8fcab1bc128a5c6bc
sunrpc: correct the computation for page_ptr when truncating

commit 5d7a5bcb67c70cbc904057ef52d3fcfeb24420bb upstream.

When truncating the encode buffer, the page_ptr is getting
advanced, causing the next page to be skipped while encoding.
The page is still included in the response, so the response
contains a page of bogus data.

We need to adjust the page_ptr backwards to ensure we encode
the next page into the correct place.

We saw this triggered when concurrent directory modifications caused
nfsd4_encode_direct_fattr() to return nfserr_noent, and the resulting
call to xdr_truncate_encode() corrupted the READDIR reply.

Signed-off-by: Frank Sorenson <sorenson@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>
net/sunrpc/xdr.c