Skip to content

Commit a23dd54

Browse files
committed
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: 6c254bf ("SUNRPC: Fix the calculation of xdr->end in xdr_get_next_encode_buffer()") Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 8a9ffb8 commit a23dd54

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/sunrpc/xdr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ static noinline __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
984984
p = page_address(*xdr->page_ptr);
985985
xdr->p = p + frag2bytes;
986986
space_left = xdr->buf->buflen - xdr->buf->len;
987-
if (space_left - nbytes >= PAGE_SIZE)
987+
if (space_left - frag1bytes >= PAGE_SIZE)
988988
xdr->end = p + PAGE_SIZE;
989989
else
990990
xdr->end = p + space_left - frag1bytes;

0 commit comments

Comments
 (0)