Commit a85ddaec authored by Namjae Jeon's avatar Namjae Jeon Committed by Li Lingfeng
Browse files

ksmbd: fix out-of-bound read in smb2_write 

mainline inclusion
from mainline-v6.4-rc6
commit 5fe7f7b7
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I7ST5T
CVE: CVE-2023-3865

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.5-rc5&id=5fe7f7b78290638806211046a99f031ff26164e1



--------------------------------

ksmbd_smb2_check_message doesn't validate hdr->NextCommand. If
->NextCommand is bigger than Offset + Length of smb2 write, It will
allow oversized smb2 write length. It will cause OOB read in smb2_write.

Cc: stable@vger.kernel.org
Reported-by: zdi-disclosures@trendmicro.com # ZDI-CAN-21164
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>

Conflict:
  fs/ksmbd/smb2misc.c
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent 387f45c0

fs/ksmbd/smb2misc.c

+9 −3
Original line number Diff line number Diff line
@@ -356,10 +356,16 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work) 
	int command;

	__u32 clc_len;  /* calculated length */

	__u32 len = get_rfc1002_len(work->request_buf);

	__u32 req_struct_size;

	__u32 req_struct_size, next_cmd = le32_to_cpu(hdr->NextCommand);



	if (le32_to_cpu(hdr->NextCommand) > 0)

		len = le32_to_cpu(hdr->NextCommand);

	if ((u64)work->next_smb2_rcv_hdr_off + next_cmd > len) {

		pr_err("next command(%u) offset exceeds smb msg size\n",

				next_cmd);

		return 1;

	}



	if (next_cmd > 0)

		len = next_cmd;

	else if (work->next_smb2_rcv_hdr_off)

		len -= work->next_smb2_rcv_hdr_off;