Commit 8735c7c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '6.7rc7-smb3-srv-fix' of git://git.samba.org/ksmbd 

Pull ksmbd server fix from Steve French:

 - address possible slab out of bounds in parsing of open requests

* tag '6.7rc7-smb3-srv-fix' of git://git.samba.org/ksmbd:
  ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
parents 505e701c d10c7787

fs/smb/server/smb2misc.c

+12 −3
Original line number Diff line number Diff line
@@ -106,16 +106,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: