From: Guanglei Zhu <zhugl3@xiaopeng.com>
To: Trond Myklebust <trondmy@kernel.org>, Anna Schumaker <anna@kernel.org>
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
liuwb@xiaopeng.com
Subject: [PATCH] NFSv4: fix bitmap length check in decode_bitmap()
Date: Mon, 12 Oct 2026 17:08:34 +0800 [thread overview]
Message-ID: <20261012090834.920912-1-zhugl3@xiaopeng.com> (raw)
decode_bitmap() reads attrlen from the callback message and passes
attrlen << 2 to xdr_inline_decode() as the number of bytes to
consume. The shift is done in 32-bit arithmetic, so an attrlen of
0x40000000 wraps to zero, the bounds check in
__xdr_inline_decode() passes, and the subsequent reads of
bitmap[0..2] walk up to 12 bytes past the end of the received
buffer.
Reject attrlen values larger than 3, the size of the bitmap array.
Signed-off-by: Guanglei Zhu <zhugl3@xiaopeng.com>
---
Verified with an ASAN build of an exact user-space replica of
decode_bitmap() and __xdr_inline_decode(): attrlen=0x40000000 with
the message ending right after the attrlen word results in a
heap-buffer-overflow READ of size 4, 0 bytes after the allocation.
fs/nfs/callback_xdr.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index 88e1af0fd..bea967e0c 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -109,6 +109,9 @@ static __be32 decode_bitmap(struct xdr_stream *xdr, uint32_t *bitmap)
if (unlikely(p == NULL))
return htonl(NFS4ERR_RESOURCE);
attrlen = ntohl(*p);
+ /* bitmap[] has only 3 words; also stops attrlen<<2 from wrapping */
+ if (unlikely(attrlen > 3))
+ return htonl(NFS4ERR_BADXDR);
p = xdr_inline_decode(xdr, attrlen << 2);
if (unlikely(p == NULL))
return htonl(NFS4ERR_RESOURCE);
--
2.43.0
reply other threads:[~2026-10-12 9:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261012090834.920912-1-zhugl3@xiaopeng.com \
--to=zhugl3@xiaopeng.com \
--cc=anna@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=liuwb@xiaopeng.com \
--cc=trondmy@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®