public inbox for linux-cifs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] smb: client: Fix integer underflow in receive_encrypted_read()
@ 2026-04-13  8:59 Dudu Lu
  0 siblings, 0 replies; only message in thread
From: Dudu Lu @ 2026-04-13  8:59 UTC (permalink / raw)
  To: linux-cifs; +Cc: sfrench, Dudu Lu

In receive_encrypted_read(), the length of data to read from the socket
is computed as:

  len = le32_to_cpu(tr_hdr->OriginalMessageSize) -
        server->vals->read_rsp_size;

OriginalMessageSize comes from the server's transform header and is
untrusted. If a malicious server sends a value smaller than
read_rsp_size (sizeof(struct smb2_read_rsp), ~80 bytes), the unsigned
subtraction wraps to a very large value (~4GB). This value is then
passed to netfs_alloc_folioq_buffer() and cifs_read_iter_from_socket(),
causing either:
  - A massive allocation attempt that fails with -ENOMEM (DoS)
  - Under extreme memory pressure, potential heap corruption

The existing validation in smb3_receive_transform() only checks
that pdu_length >= orig_len + sizeof(transform_hdr), which does
not prevent orig_len from being smaller than read_rsp_size.

Fix this by adding a check that OriginalMessageSize is at least
read_rsp_size before the subtraction.

Signed-off-by: Dudu Lu <phx0fer@gmail.com>
---
 fs/smb/client/smb2ops.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index 509fcea28a42..ca90f96052d4 100644
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -4943,6 +4943,14 @@ receive_encrypted_read(struct TCP_Server_Info *server, struct mid_q_entry **mid,
 		goto free_dw;
 	server->total_read += rc;
 
+	if (le32_to_cpu(tr_hdr->OriginalMessageSize) <
+	    server->vals->read_rsp_size) {
+		cifs_server_dbg(VFS, "OriginalMessageSize %u too small for read response (%u)\n",
+			le32_to_cpu(tr_hdr->OriginalMessageSize),
+			server->vals->read_rsp_size);
+		rc = -EINVAL;
+		goto free_dw;
+	}
 	len = le32_to_cpu(tr_hdr->OriginalMessageSize) -
 		server->vals->read_rsp_size;
 	dw->len = len;
-- 
2.39.3 (Apple Git-145)


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-04-13  9:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-13  8:59 [PATCH] smb: client: Fix integer underflow in receive_encrypted_read() Dudu Lu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox