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

!3855 [sync] PR-3694: Fix tow CVEs of CIFS 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/3694 
 
PR sync from: ZhaoLong Wang <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MIQNRG3ERCG2XFHKT6V7FJ5Y5M3MKJ2F/ 
CVE-2023-6606
CVE-2023-6610

Paulo Alcantara (2):
  smb: client: fix OOB in smbCalcSize()
  smb: client: fix potential OOB in smb2_dump_detail()


-- 
2.34.3
 
https://gitee.com/src-openeuler/kernel/issues/I8MXXY
https://gitee.com/src-openeuler/kernel/issues/I8MXXW 
 
Link:https://gitee.com/openeuler/kernel/pulls/3855

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 3ed9e131 ea7e221d

fs/cifs/misc.c

+4 −0
Original line number Diff line number Diff line
@@ -353,6 +353,10 @@ checkSMB(char *buf, unsigned int total_read, struct TCP_Server_Info *server) 
			cifs_dbg(VFS, "Length less than smb header size\n");

		}

		return -EIO;

	} else if (total_read < sizeof(*smb) + 2 * smb->WordCount) {

		cifs_dbg(VFS, "%s: can't read BCC due to invalid WordCount(%u)\n",

			 __func__, smb->WordCount);

		return -EIO;

	}



	/* otherwise, there is enough to get to the BCC */

fs/cifs/smb2misc.c

+15 −15
Original line number Diff line number Diff line
@@ -174,6 +174,21 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *srvr) 
	}



	mid = le64_to_cpu(shdr->MessageId);

	if (check_smb2_hdr(shdr, mid))

		return 1;



	if (shdr->StructureSize != SMB2_HEADER_STRUCTURE_SIZE) {

		cifs_dbg(VFS, "Invalid structure size %u\n",

			 le16_to_cpu(shdr->StructureSize));

		return 1;

	}



	command = le16_to_cpu(shdr->Command);

	if (command >= NUMBER_OF_SMB2_COMMANDS) {

		cifs_dbg(VFS, "Invalid SMB2 command %d\n", command);

		return 1;

	}



	if (len < pdu_size) {

		if ((len >= hdr_size)

		    && (shdr->Status != 0)) {
@@ -194,21 +209,6 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *srvr) 
		return 1;

	}



	if (check_smb2_hdr(shdr, mid))

		return 1;



	if (shdr->StructureSize != SMB2_HEADER_STRUCTURE_SIZE) {

		cifs_dbg(VFS, "Invalid structure size %u\n",

			 le16_to_cpu(shdr->StructureSize));

		return 1;

	}



	command = le16_to_cpu(shdr->Command);

	if (command >= NUMBER_OF_SMB2_COMMANDS) {

		cifs_dbg(VFS, "Invalid SMB2 command %d\n", command);

		return 1;

	}



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

		if (command != SMB2_OPLOCK_BREAK_HE && (shdr->Status == 0 ||

		    pdu->StructureSize2 != SMB2_ERROR_STRUCTURE_SIZE2)) {

fs/cifs/smb2ops.c

+4 −2
Original line number Diff line number Diff line
@@ -314,8 +314,10 @@ smb2_dump_detail(void *buf, struct TCP_Server_Info *server) 
	cifs_server_dbg(VFS, "Cmd: %d Err: 0x%x Flags: 0x%x Mid: %llu Pid: %d\n",

		 shdr->Command, shdr->Status, shdr->Flags, shdr->MessageId,

		 shdr->ProcessId);

	if (!server->ops->check_message(buf, server->total_read, server)) {

		cifs_server_dbg(VFS, "smb buf %p len %u\n", buf,

				server->ops->calc_smb_size(buf, server));

	}

#endif

}