Commit 2ea086e3 authored by Hyunchul Lee's avatar Hyunchul Lee Committed by Steve French
Browse files

ksmbd: add buffer validation for smb direct 



Add buffer validation for smb direct.

Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarHyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 4bc59477

fs/ksmbd/transport_rdma.c

+19 −2
Original line number Diff line number Diff line
@@ -549,6 +549,10 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) 


	switch (recvmsg->type) {

	case SMB_DIRECT_MSG_NEGOTIATE_REQ:

		if (wc->byte_len < sizeof(struct smb_direct_negotiate_req)) {

			put_empty_recvmsg(t, recvmsg);

			return;

		}

		t->negotiation_requested = true;

		t->full_packet_received = true;

		wake_up_interruptible(&t->wait_status);
@@ -556,10 +560,23 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) 
	case SMB_DIRECT_MSG_DATA_TRANSFER: {

		struct smb_direct_data_transfer *data_transfer =

			(struct smb_direct_data_transfer *)recvmsg->packet;

		int data_length = le32_to_cpu(data_transfer->data_length);

		unsigned int data_length;

		int avail_recvmsg_count, receive_credits;



		if (wc->byte_len <

		    offsetof(struct smb_direct_data_transfer, padding)) {

			put_empty_recvmsg(t, recvmsg);

			return;

		}



		data_length = le32_to_cpu(data_transfer->data_length);

		if (data_length) {

			if (wc->byte_len < sizeof(struct smb_direct_data_transfer) +

			    (u64)data_length) {

				put_empty_recvmsg(t, recvmsg);

				return;

			}



			if (t->full_packet_received)

				recvmsg->first_segment = true;
@@ -568,7 +585,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) 
			else

				t->full_packet_received = true;



			enqueue_reassembly(t, recvmsg, data_length);

			enqueue_reassembly(t, recvmsg, (int)data_length);

			wake_up_interruptible(&t->wait_reassembly_queue);



			spin_lock(&t->receive_credit_lock);