Skip to contentSkip to conversation

FAILED: patch "[PATCH] ksmbd: smbdirect: verify remaining_data_length respects" failed to apply to 5.15-stable tree

PATCH New [email protected] 2 participants 2 messages Sep 21, 2025 – Sep 22, 2025

Subsystems (4)
Stable branch SMB client (CIFS) Kernel SMB3 server (ksmbd) Smbdirect (RDMA Stream Transport with Read/Write-Offload, MS-SMBD)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x e1868ba37fd27c6a68e31565402b154beaa65df0
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025092135-estate-gander-564d@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..

Possible dependencies:

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From e1868ba37fd27c6a68e31565402b154beaa65df0 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <[email protected]>
Date: Thu, 11 Sep 2025 10:05:23 +0900
Subject: [PATCH] ksmbd: smbdirect: verify remaining_data_length respects
max_fragmented_recv_size

This is inspired by the check for data_offset + data_length.

Cc Steve French <[email protected]>
Cc Tom Talpey <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Fixes 2ea086e35c3d ("ksmbd: add buffer validation for smb direct")
Acked-by Namjae Jeon <[email protected]>
Signed-off-by Stefan Metzmacher <[email protected]>
Signed-off-by Steve French <[email protected]>
fs/smb/server/transport_rdma.c +10 -1
index d52f37578276..6550bd9f002c 100644
@@ -554,7 +554,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)
 	case SMB_DIRECT_MSG_DATA_TRANSFER: {
 		struct smb_direct_data_transfer *data_transfer =
 			(struct smb_direct_data_transfer *)recvmsg->packet;
-		unsigned int data_offset, data_length;
+		u32 remaining_data_length, data_offset, data_length;
 		int avail_recvmsg_count, receive_credits;
 
 		if (wc->byte_len <

@@ -564,6 +564,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)
 			return;
 		}
 
+		remaining_data_length = le32_to_cpu(data_transfer->remaining_data_length);
 		data_length = le32_to_cpu(data_transfer->data_length);
 		data_offset = le32_to_cpu(data_transfer->data_offset);
 		if (wc->byte_len < data_offset ||

@@ -572,6 +573,14 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)
 			smb_direct_disconnect_rdma_connection(t);
 			return;
 		}
+		if (remaining_data_length > t->max_fragmented_recv_size ||
+		    data_length > t->max_fragmented_recv_size ||
+		    (u64)remaining_data_length + (u64)data_length >
+		    (u64)t->max_fragmented_recv_size) {
+			put_recvmsg(t, recvmsg);
+			smb_direct_disconnect_rdma_connection(t);
+			return;
+		}
 
 		if (data_length) {
 			if (t->full_packet_received)
maintainer
#1 lore raw

PATCH 1/1 ksmbd: smbdirect: verify remaining_data_length respects max_fragmented_recv_size

From: Stefan Metzmacher <[email protected]>

[ Upstream commit e1868ba37fd27c6a68e31565402b154beaa65df0 ]

This is inspired by the check for data_offset + data_length.

Cc Steve French <[email protected]>
Cc Tom Talpey <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Fixes 2ea086e35c3d ("ksmbd: add buffer validation for smb direct")
Acked-by Namjae Jeon <[email protected]>
Signed-off-by Stefan Metzmacher <[email protected]>
Signed-off-by Steve French <[email protected]>
[ No data_offset ]
Signed-off-by Sasha Levin <[email protected]>
---
 fs/ksmbd/transport_rdma.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
fs/ksmbd/transport_rdma.c +10 -1
index 2f02632905842..53e543129fe12 100644
@@ -548,7 +548,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)
 	case SMB_DIRECT_MSG_DATA_TRANSFER: {
 		struct smb_direct_data_transfer *data_transfer =
 			(struct smb_direct_data_transfer *)recvmsg->packet;
-		unsigned int data_length;
+		u32 remaining_data_length, data_length;
 		int avail_recvmsg_count, receive_credits;
 
 		if (wc->byte_len <

@@ -558,7 +558,16 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)
 			return;
 		}
 
+		remaining_data_length = le32_to_cpu(data_transfer->remaining_data_length);
 		data_length = le32_to_cpu(data_transfer->data_length);
+		if (remaining_data_length > t->max_fragmented_recv_size ||
+		    data_length > t->max_fragmented_recv_size ||
+		    (u64)remaining_data_length + (u64)data_length >
+		    (u64)t->max_fragmented_recv_size) {
+			put_recvmsg(t, recvmsg);
+			smb_direct_disconnect_rdma_connection(t);
+			return;
+		}
 		if (data_length) {
 			if (wc->byte_len < sizeof(struct smb_direct_data_transfer) +
 			    (u64)data_length) {
Signature · 1 line
2.51.0