]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.17-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2025 10:38:59 +0000 (11:38 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2025 10:38:59 +0000 (11:38 +0100)
added patches:
ksmbd-transport_ipc-validate-payload-size-before-reading-handle.patch

queue-6.17/ksmbd-transport_ipc-validate-payload-size-before-reading-handle.patch [new file with mode: 0644]
queue-6.17/series

diff --git a/queue-6.17/ksmbd-transport_ipc-validate-payload-size-before-reading-handle.patch b/queue-6.17/ksmbd-transport_ipc-validate-payload-size-before-reading-handle.patch
new file mode 100644 (file)
index 0000000..d716bd3
--- /dev/null
@@ -0,0 +1,47 @@
+From 6f40e50ceb99fc8ef37e5c56e2ec1d162733fef0 Mon Sep 17 00:00:00 2001
+From: Qianchang Zhao <pioooooooooip@gmail.com>
+Date: Wed, 22 Oct 2025 15:27:47 +0900
+Subject: ksmbd: transport_ipc: validate payload size before reading handle
+
+From: Qianchang Zhao <pioooooooooip@gmail.com>
+
+commit 6f40e50ceb99fc8ef37e5c56e2ec1d162733fef0 upstream.
+
+handle_response() dereferences the payload as a 4-byte handle without
+verifying that the declared payload size is at least 4 bytes. A malformed
+or truncated message from ksmbd.mountd can lead to a 4-byte read past the
+declared payload size. Validate the size before dereferencing.
+
+This is a minimal fix to guard the initial handle read.
+
+Fixes: 0626e6641f6b ("cifsd: add server handler for central processing and tranport layers")
+Cc: stable@vger.kernel.org
+Reported-by: Qianchang Zhao <pioooooooooip@gmail.com>
+Signed-off-by: Qianchang Zhao <pioooooooooip@gmail.com>
+Acked-by: Namjae Jeon <linkinjeon@kernel.org>
+Signed-off-by: Steve French <stfrench@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/smb/server/transport_ipc.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/fs/smb/server/transport_ipc.c
++++ b/fs/smb/server/transport_ipc.c
+@@ -263,10 +263,16 @@ static void ipc_msg_handle_free(int hand
+ static int handle_response(int type, void *payload, size_t sz)
+ {
+-      unsigned int handle = *(unsigned int *)payload;
++      unsigned int handle;
+       struct ipc_msg_table_entry *entry;
+       int ret = 0;
++      /* Prevent 4-byte read beyond declared payload size */
++      if (sz < sizeof(unsigned int))
++              return -EINVAL;
++
++      handle = *(unsigned int *)payload;
++
+       ipc_update_last_active();
+       down_read(&ipc_msg_table_lock);
+       hash_for_each_possible(ipc_msg_table, entry, ipc_table_hlist, handle) {
index 948766ad0d0528541e9d50acea43f7725a2416c3..5260d27209e660fad05e3b7e68227625458ab0ed 100644 (file)
@@ -182,3 +182,4 @@ xfs-always-warn-about-deprecated-mount-options.patch
 gpio-regmap-allow-to-allocate-regmap-irq-device.patch
 gpio-regmap-add-the-.fixed_direction_output-configuration-parameter.patch
 gpio-idio-16-define-fixed-direction-of-the-gpio-lines.patch
+ksmbd-transport_ipc-validate-payload-size-before-reading-handle.patch