From: Frank Sorenson <sorenson@redhat.com>
To: linux-cifs@vger.kernel.org, pc@manguebit.org
Cc: linkinjeon@kernel.org, ronniesahlberg@gmail.com,
sprasad@microsoft.com, tom@talpey.com, bharathsm@microsoft.com,
stable@vger.kernel.org
Subject: [PATCH v5 3/9] smb: client: fix server->total_read for compound encrypted PDUs
Date: Wed, 16 Sep 2026 16:33:54 -0500 [thread overview]
Message-ID: <20260916213406.1496960-4-sorenson@redhat.com> (raw)
In-Reply-To: <20260916213406.1496960-1-sorenson@redhat.com>
In receive_encrypted_standard(), server->total_read is left at the
full decrypted frame size when walking sub-PDUs of a compound encrypted
frame. As a result, cifs_handle_standard() passes this full size
to smb2_check_message(), causing the PDU length guards to incorrectly
validate the entire compound frame instead of the current sub-PDU.
This allows truncated non-last sub-PDUs to bypass length validation,
leading to out-of-bounds reads in smb2_get_data_area_len().
Fix this by setting server->total_read to the true length of the
current sub-PDU: next_cmd for non-last sub-PDUs, and the remaining
pdu_length for the last one.
Fixes: b24df3e30cbf ("cifs: update receive_encrypted_standard to handle compounded responses")
Cc: stable@vger.kernel.org
Signed-off-by: Frank Sorenson <sorenson@redhat.com>
---
fs/smb/client/smb2ops.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index fcf7033889c7..7f2177f6fc01 100644
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -5371,6 +5371,7 @@ receive_encrypted_standard(struct TCP_Server_Info *server,
one_more:
shdr = (struct smb2_hdr *)buf;
next_cmd = le32_to_cpu(shdr->NextCommand);
+ server->total_read = next_cmd ? next_cmd : pdu_length;
if (*num_mids >= MAX_COMPOUND) {
cifs_server_dbg(VFS, "too many PDUs in compound\n");
--
2.55.0
next prev parent reply other threads:[~2026-09-16 21:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-16 21:33 [PATCH v5 0/9] smb: client: fix OOB reads and UAFs in SMB2/3 receive paths Frank Sorenson
2026-09-16 21:33 ` [PATCH v5 1/9] smb: client: fix next_buffer UAF and NextCommand bounds in compound PDUs Frank Sorenson
2026-09-16 21:33 ` [PATCH v5 2/9] smb: client: validate minimum PDU size before smb2_get_data_area_len() Frank Sorenson
2026-09-16 21:33 ` Frank Sorenson [this message]
2026-09-16 21:33 ` [PATCH v5 4/9] smb: client: fix missing lower-bound check on DFS referral string offsets Frank Sorenson
2026-09-16 21:33 ` [PATCH v5 5/9] smb: client: reject short Next offsets in parse_server_interfaces() Frank Sorenson
2026-09-16 21:33 ` [PATCH v5 6/9] smb: client: fix OOB struct field reads in move_smb2_ea_to_cifs() Frank Sorenson
2026-09-16 21:33 ` [PATCH v5 7/9] smb: client: fix missing iov bounds check in parse_posix_sids() Frank Sorenson
2026-09-16 21:33 ` [PATCH v5 8/9] smb: client: fix potential OOB read in smb3_enum_snapshots() Frank Sorenson
2026-09-16 21:34 ` [PATCH v5 9/9] smb: client: fix reparse buffer bounds in cifs_query_reparse_point() Frank Sorenson
2026-09-17 18:15 ` [PATCH v5 0/9] smb: client: fix OOB reads and UAFs in SMB2/3 receive paths Paulo Alcantara
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=20260916213406.1496960-4-sorenson@redhat.com \
--to=sorenson@redhat.com \
--cc=bharathsm@microsoft.com \
--cc=linkinjeon@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=pc@manguebit.org \
--cc=ronniesahlberg@gmail.com \
--cc=sprasad@microsoft.com \
--cc=stable@vger.kernel.org \
--cc=tom@talpey.com \
/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