Unverified Commit de0e35ce authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1827 [sync] PR-1813: ksmbd: fix cve-2023-38432 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/1813 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4S4SHAOWCO2WEWFW2EFRTQPJRF5RA2ZA/ 
Long Li (1):
  ksmbd: validate command request size

Namjae Jeon (1):
  ksmbd: validate command payload size


-- 
2.31.1
 
https://gitee.com/src-openeuler/kernel/issues/I7LU3O 
 
Link:https://gitee.com/openeuler/kernel/pulls/1827

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents a1ef8cc4 0f4fba94

fs/ksmbd/smb2misc.c

+14 −13
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ 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;



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

		len = le32_to_cpu(hdr->NextCommand);
@@ -378,25 +379,25 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work) 
	}



	if (smb2_req_struct_sizes[command] != pdu->StructureSize2) {

		if (command != SMB2_OPLOCK_BREAK_HE &&

		    (hdr->Status == 0 || pdu->StructureSize2 != SMB2_ERROR_STRUCTURE_SIZE2_LE)) {

			/* error packets have 9 byte structure size */

		if (!(command == SMB2_OPLOCK_BREAK_HE &&

		    (le16_to_cpu(pdu->StructureSize2) == OP_BREAK_STRUCT_SIZE_20 ||

		    le16_to_cpu(pdu->StructureSize2) == OP_BREAK_STRUCT_SIZE_21))) {

			/* special case for SMB2.1 lease break message */

			ksmbd_debug(SMB,

				"Illegal request size %u for command %d\n",

				le16_to_cpu(pdu->StructureSize2), command);

			return 1;

		} else if (command == SMB2_OPLOCK_BREAK_HE &&

			   hdr->Status == 0 &&

			   le16_to_cpu(pdu->StructureSize2) != OP_BREAK_STRUCT_SIZE_20 &&

			   le16_to_cpu(pdu->StructureSize2) != OP_BREAK_STRUCT_SIZE_21) {

			/* special case for SMB2.1 lease break message */

			ksmbd_debug(SMB,

				    "Illegal request size %d for oplock break\n",

				    le16_to_cpu(pdu->StructureSize2));

			return 1;

		}

	}



	req_struct_size = le16_to_cpu(pdu->StructureSize2) +

		__SMB2_HEADER_STRUCTURE_SIZE;

	if (command == SMB2_LOCK_HE)

		req_struct_size -= sizeof(struct smb2_lock_element);



	if (req_struct_size > len + 1)

		return 1;



	if (smb2_calc_size(hdr, &clc_len))

		return 1;