Commit 374a7f47 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '6.5-rc5-ksmbd-server' of git://git.samba.org/ksmbd 

Pull smb server fixes from Steve French:
 "Two ksmbd server fixes, both also for stable:

   - improve buffer validation when multiple EAs returned

   - missing check for command payload size"

* tag '6.5-rc5-ksmbd-server' of git://git.samba.org/ksmbd:
  ksmbd: fix wrong next length validation of ea buffer in smb2_set_ea()
  ksmbd: validate command request size
parents b4f63b0f 79ed288c

fs/smb/server/smb2misc.c

+5 −5
Original line number Diff line number Diff line
@@ -380,13 +380,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;

		}

	}

fs/smb/server/smb2pdu.c

+8 −1
Original line number Diff line number Diff line
@@ -2324,9 +2324,16 @@ static int smb2_set_ea(struct smb2_ea_info *eabuf, unsigned int buf_len, 
			break;

		buf_len -= next;

		eabuf = (struct smb2_ea_info *)((char *)eabuf + next);

		if (next < (u32)eabuf->EaNameLength + le16_to_cpu(eabuf->EaValueLength))

		if (buf_len < sizeof(struct smb2_ea_info)) {

			rc = -EINVAL;

			break;

		}



		if (buf_len < sizeof(struct smb2_ea_info) + eabuf->EaNameLength +

				le16_to_cpu(eabuf->EaValueLength)) {

			rc = -EINVAL;

			break;

		}

	} while (next != 0);



	kfree(attr_name);