This is a note to let you know that I've just added the patch titled
ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ksmbd-validate-request-buffer-size-in-smb2_allocate_rsp_buf.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 17cf0c2794bdb6f39671265aa18aea5c22ee8c4a Mon Sep 17 00:00:00 2001
From: Namjae Jeon <linkinjeon@xxxxxxxxxx>
Date: Fri, 12 Apr 2024 09:45:00 +0900
Subject: ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
From: Namjae Jeon <linkinjeon@xxxxxxxxxx>
commit 17cf0c2794bdb6f39671265aa18aea5c22ee8c4a upstream.
The response buffer should be allocated in smb2_allocate_rsp_buf
before validating request. But the fields in payload as well as smb2 header
is used in smb2_allocate_rsp_buf(). This patch add simple buffer size
validation to avoid potencial out-of-bounds in request buffer.
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Namjae Jeon <linkinjeon@xxxxxxxxxx>
Signed-off-by: Steve French <stfrench@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/smb/server/smb2pdu.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -535,6 +535,10 @@ int smb2_allocate_rsp_buf(struct ksmbd_w
if (cmd == SMB2_QUERY_INFO_HE) {
struct smb2_query_info_req *req;
+ if (get_rfc1002_len(work->request_buf) <
+ offsetof(struct smb2_query_info_req, OutputBufferLength))
+ return -EINVAL;
+
req = smb2_get_msg(work->request_buf);
if ((req->InfoType == SMB2_O_INFO_FILE &&
(req->FileInfoClass == FILE_FULL_EA_INFORMATION ||
Patches currently in stable-queue which might be from linkinjeon@xxxxxxxxxx are
queue-6.6/ksmbd-clear-rename_noreplace-before-calling-vfs_rename.patch
queue-6.6/ksmbd-fix-slab-out-of-bounds-in-smb2_allocate_rsp_buf.patch
queue-6.6/ksmbd-common-use-struct_group_attr-instead-of-struct_group-for-network_open_info.patch
queue-6.6/ksmbd-validate-request-buffer-size-in-smb2_allocate_rsp_buf.patch
