mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 20:51:03 +02:00
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: 6c254bf3b6
("SUNRPC: Fix the calculation of xdr->end in xdr_get_next_encode_buffer()")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user