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

!4266 ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16() 

Merge Pull Request from: @ci-robot 
 
PR sync from: ZhaoLong Wang <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CZ7AATGI5DUSVW6ZZ6GS2AIMZB43YLNN/ 
 
https://gitee.com/src-openeuler/kernel/issues/I8YD63 
 
Link:https://gitee.com/openeuler/kernel/pulls/4266

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents d5c6fe96 d6339ed9

fs/ksmbd/smb2misc.c

+12 −3
Original line number Diff line number Diff line
@@ -107,16 +107,25 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len, 
		break;

	case SMB2_CREATE:

	{

		unsigned short int name_off =

			le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset);

		unsigned short int name_len =

			le16_to_cpu(((struct smb2_create_req *)hdr)->NameLength);



		if (((struct smb2_create_req *)hdr)->CreateContextsLength) {

			*off = le32_to_cpu(((struct smb2_create_req *)

				hdr)->CreateContextsOffset);

			*len = le32_to_cpu(((struct smb2_create_req *)

				hdr)->CreateContextsLength);

			if (!name_len)

				break;



			if (name_off + name_len < (u64)*off + *len)

				break;

		}



		*off = le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset);

		*len = le16_to_cpu(((struct smb2_create_req *)hdr)->NameLength);

		*off = name_off;

		*len = name_len;

		break;

	}

	case SMB2_QUERY_INFO: