Commit 0f4fba94 authored by Long Li's avatar Long Li Committed by openeuler-sync-bot
Browse files

ksmbd: validate command request size 

mainline inclusion
from mainline-v6.5-rc4
commit 5aa4fda5
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I7LU3O
CVE: CVE-2023-38432

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5aa4fda5aa9c2a5a7bac67b4a12b089ab81fee3c



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

In commit 2b9b8f3b ("ksmbd: validate command payload size"), except
for SMB2_OPLOCK_BREAK_HE command, the request size of other commands
is not checked, it's not expected. Fix it by add check for request
size of other commands.

Cc: stable@vger.kernel.org
Fixes: 2b9b8f3b ("ksmbd: validate command payload size")
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>

Conflicts:
	fs/ksmbd/smb2misc.c

Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
(cherry picked from commit 9b99303a)
parent 7d3d178a

fs/ksmbd/smb2misc.c

+5 −5
Original line number Diff line number Diff line
@@ -379,13 +379,13 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work) 
	}



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

		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) {

		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 %d for oplock break\n",

				    le16_to_cpu(pdu->StructureSize2));

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

				le16_to_cpu(pdu->StructureSize2), command);

			return 1;

		}

	}