diff options
| author | Frank Sorenson <sorenson@redhat.com> | 2018-10-30 15:10:40 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-21 09:27:44 +0100 |
| commit | 4293fbc271e4da53c690a1c913ad3b2252b575ab (patch) | |
| tree | 698423b6b0a78ae095402ba8713a99cf78ed2b78 | |
| parent | f7e6ee2e18cc745f05a9fe678de65ac24a6adcfd (diff) | |
| download | linux-stable-4293fbc271e4da53c690a1c913ad3b2252b575ab.tar.gz linux-stable-4293fbc271e4da53c690a1c913ad3b2252b575ab.tar.bz2 linux-stable-4293fbc271e4da53c690a1c913ad3b2252b575ab.zip | |
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>
| -rw-r--r-- | net/sunrpc/xdr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 4439ac4c1b53..9b8d855e4a87 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -639,11 +639,10 @@ void xdr_truncate_encode(struct xdr_stream *xdr, size_t len) WARN_ON_ONCE(xdr->iov); return; } - if (fraglen) { + if (fraglen) xdr->end = head->iov_base + head->iov_len; - xdr->page_ptr--; - } /* (otherwise assume xdr->end is already set) */ + xdr->page_ptr--; head->iov_len = len; buf->len = len; xdr->p = head->iov_base + head->iov_len; |