Commit dae0c676 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Changpeng Liu
Browse files

lib/iscsi: Check data segment length separately for SCSI Data-Out and NOP-Out 



For SCSI Data-Out and NOP-Out, we can move data segment length check from
iscsi_check_data_segment_length() to iscsi_op_data() and iscsi_op_nopout(),
respectively.

In iscsi_op_nopout(), data_len had been got from reqh->data_segment_len
but reqh->data_segment_len is already copied to pdu->data_segment_len at
spdk_iscsi_read_pdu(). So add a change to use pdu->data_segment_len to
this patch. This is little change to create a single independent patch.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Iff7d763d8ce48bdb483b809a98be82996f73f471
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/470724


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent f8f49eba

lib/iscsi/iscsi.c

+11 −2
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ iscsi_check_data_segment_length(struct spdk_iscsi_conn *conn, 
		return true;

	} else if (pdu->bhs.opcode == ISCSI_OP_SCSI_DATAOUT ||

		   pdu->bhs.opcode == ISCSI_OP_NOPOUT) {

		max_segment_len = SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH;

		return true;

	} else {

		max_segment_len = spdk_get_max_immediate_data_size();

	}
@@ -3862,10 +3862,14 @@ iscsi_op_nopout(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu) 
		return SPDK_ISCSI_CONNECTION_FATAL;

	}



	if (pdu->data_segment_len > SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH) {

		return iscsi_reject(conn, pdu, ISCSI_REASON_PROTOCOL_ERROR);

	}



	reqh = (struct iscsi_bhs_nop_out *)&pdu->bhs;

	I_bit = reqh->immediate;



	data_len = DGET24(reqh->data_segment_len);

	data_len = pdu->data_segment_len;

	if (data_len > conn->MaxRecvDataSegmentLength) {

		data_len = conn->MaxRecvDataSegmentLength;

	}
@@ -4308,6 +4312,11 @@ iscsi_op_data(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu) 
		return SPDK_ISCSI_CONNECTION_FATAL;

	}



	if (pdu->data_segment_len > SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH) {

		reject_reason = ISCSI_REASON_PROTOCOL_ERROR;

		goto reject_return;

	}



	reqh = (struct iscsi_bhs_data_out *)&pdu->bhs;

	F_bit = !!(reqh->flags & ISCSI_FLAG_FINAL);

	transfer_tag = from_be32(&reqh->ttt);