diff options
| author |   Chuck Lever <chuck.lever@oracle.com> | 2022-06-30 16:48:18 -0400 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2022-06-30 17:41:08 -0400 |
| commit | a23dd544debcda4ee4a549ec7de59e85c3c8345c (patch) | |
| tree | aa3b6b3a3a446080d8a9d66e65d70689f1bacea3 /net/sunrpc/xdr.c | |
| parent | NFSD: restore EINVAL error translation in nfsd_commit() (diff) | |
| download | linux-dev-a23dd544debcda4ee4a549ec7de59e85c3c8345c.tar.xz linux-dev-a23dd544debcda4ee4a549ec7de59e85c3c8345c.zip | |
SUNRPC: Fix READ_PLUS crasher
Looks like there are still cases when "space_left - frag1bytes" can
legitimately exceed PAGE_SIZE. Ensure that xdr->end always remains
within the current encode buffer.
Reported-by: Bruce Fields <bfields@fieldses.org>
Reported-by: Zorro Lang <zlang@redhat.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216151
Fixes: 6c254bf3b637 ("SUNRPC: Fix the calculation of xdr->end in xdr_get_next_encode_buffer()")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to '')
| -rw-r--r-- | net/sunrpc/xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index f87a2d8f23a7..5d2b3e6979fb 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -984,7 +984,7 @@ static noinline __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr, p = page_address(*xdr->page_ptr); xdr->p = p + frag2bytes; space_left = xdr->buf->buflen - xdr->buf->len; - if (space_left - nbytes >= PAGE_SIZE) + if (space_left - frag1bytes >= PAGE_SIZE) xdr->end = p + PAGE_SIZE; else xdr->end = p + space_left - frag1bytes; |