Blame patches.suse/SUNRPC-Fix-READ_PLUS-crasher.patch
|
NeilBrown |
1bfe9b |
From: Chuck Lever <chuck.lever@oracle.com>
|
|
NeilBrown |
1bfe9b |
Date: Thu, 30 Jun 2022 16:48:18 -0400
|
|
NeilBrown |
1bfe9b |
Subject: [PATCH] SUNRPC: Fix READ_PLUS crasher
|
|
NeilBrown |
1bfe9b |
Git-commit: a23dd544debcda4ee4a549ec7de59e85c3c8345c
|
|
NeilBrown |
1bfe9b |
Patch-mainline: v5.19
|
|
NeilBrown |
1bfe9b |
References: git-fixes
|
|
NeilBrown |
1bfe9b |
|
|
NeilBrown |
1bfe9b |
Looks like there are still cases when "space_left - frag1bytes" can
|
|
NeilBrown |
1bfe9b |
legitimately exceed PAGE_SIZE. Ensure that xdr->end always remains
|
|
NeilBrown |
1bfe9b |
within the current encode buffer.
|
|
NeilBrown |
1bfe9b |
|
|
NeilBrown |
1bfe9b |
Reported-by: Bruce Fields <bfields@fieldses.org>
|
|
NeilBrown |
1bfe9b |
Reported-by: Zorro Lang <zlang@redhat.com>
|
|
NeilBrown |
1bfe9b |
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216151
|
|
NeilBrown |
1bfe9b |
Fixes: 6c254bf3b637 ("SUNRPC: Fix the calculation of xdr->end in xdr_get_next_encode_buffer()")
|
|
NeilBrown |
1bfe9b |
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
|
|
NeilBrown |
1bfe9b |
Acked-by: NeilBrown <neilb@suse.com>
|
|
NeilBrown |
1bfe9b |
|
|
NeilBrown |
1bfe9b |
---
|
|
NeilBrown |
1bfe9b |
net/sunrpc/xdr.c | 2 +-
|
|
NeilBrown |
1bfe9b |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
NeilBrown |
1bfe9b |
|
|
NeilBrown |
1bfe9b |
--- a/net/sunrpc/xdr.c
|
|
NeilBrown |
1bfe9b |
+++ b/net/sunrpc/xdr.c
|
|
NeilBrown |
1bfe9b |
@@ -544,7 +544,7 @@ static __be32 *xdr_get_next_encode_buffe
|
|
NeilBrown |
1bfe9b |
*/
|
|
NeilBrown |
1bfe9b |
xdr->p = (void *)p + frag2bytes;
|
|
NeilBrown |
1bfe9b |
space_left = xdr->buf->buflen - xdr->buf->len;
|
|
NeilBrown |
1bfe9b |
- if (space_left - nbytes >= PAGE_SIZE)
|
|
NeilBrown |
1bfe9b |
+ if (space_left - frag1bytes >= PAGE_SIZE)
|
|
NeilBrown |
1bfe9b |
xdr->end = (void *)p + PAGE_SIZE;
|
|
NeilBrown |
1bfe9b |
else
|
|
NeilBrown |
1bfe9b |
xdr->end = (void *)p + space_left - frag1bytes;
|