From: Greg Kroah-Hartman Date: Wed, 29 Oct 2025 10:38:59 +0000 (+0100) Subject: 6.17-stable patches X-Git-Tag: v5.4.301~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93c5a086aef159263e47c02a8d8e80356de88fb1;p=thirdparty%2Fkernel%2Fstable-queue.git 6.17-stable patches added patches: ksmbd-transport_ipc-validate-payload-size-before-reading-handle.patch --- 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 index 0000000000..d716bd3245 --- /dev/null +++ b/queue-6.17/ksmbd-transport_ipc-validate-payload-size-before-reading-handle.patch @@ -0,0 +1,47 @@ +From 6f40e50ceb99fc8ef37e5c56e2ec1d162733fef0 Mon Sep 17 00:00:00 2001 +From: Qianchang Zhao +Date: Wed, 22 Oct 2025 15:27:47 +0900 +Subject: ksmbd: transport_ipc: validate payload size before reading handle + +From: Qianchang Zhao + +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 +Signed-off-by: Qianchang Zhao +Acked-by: Namjae Jeon +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman +--- + 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) { diff --git a/queue-6.17/series b/queue-6.17/series index 948766ad0d..5260d27209 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -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