Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76a477d3 authored by Chuck Lever's avatar Chuck Lever Committed by Greg Kroah-Hartman
Browse files

SUNRPC: Fix READ_PLUS crasher 



commit a23dd544debcda4ee4a549ec7de59e85c3c8345c upstream.

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: default avatarBruce Fields <bfields@fieldses.org>
Reported-by: default avatarZorro 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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 13816057

net/sunrpc/xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr, 
	 */

	xdr->p = (void *)p + frag2bytes;

	space_left = xdr->buf->buflen - xdr->buf->len;

	if (space_left - nbytes >= PAGE_SIZE)

	if (space_left - frag1bytes >= PAGE_SIZE)

		xdr->end = (void *)p + PAGE_SIZE;

	else

		xdr->end = (void *)p + space_left - frag1bytes;