Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf310b8f authored by zhenyu.z.wang@intel.com's avatar zhenyu.z.wang@intel.com Committed by James Bottomley
Browse files

[SCSI] iscsi: data under/over flow fix 



We need to check the ISCSI_FLAG_DATA_* flags.

Signed-off-by: default avatarAlex Aizman <itn780@yahoo.com>
Signed-off-by: default avatarDmitry Yusupov <dmitry_yus@yahoo.com>
Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 42f72aa9

drivers/scsi/iscsi_tcp.c

+2 −4
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask) 
		struct scsi_cmnd *sc = ctask->sc;



		conn->exp_statsn = be32_to_cpu(rhdr->statsn) + 1;

		if (rhdr->flags & ISCSI_FLAG_CMD_UNDERFLOW) {

		if (rhdr->flags & ISCSI_FLAG_DATA_UNDERFLOW) {

			int res_count = be32_to_cpu(rhdr->residual_count);



			if (res_count > 0 &&
@@ -367,9 +367,7 @@ iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask) 
			} else

				sc->result = (DID_BAD_TARGET << 16) |

					rhdr->cmd_status;

		} else if (rhdr->flags & ISCSI_FLAG_CMD_BIDI_UNDERFLOW)

			sc->result = (DID_BAD_TARGET << 16) | rhdr->cmd_status;

		else if (rhdr->flags & ISCSI_FLAG_CMD_OVERFLOW) {

		} else if (rhdr->flags & ISCSI_FLAG_DATA_OVERFLOW) {

			sc->resid = be32_to_cpu(rhdr->residual_count);

			sc->result = (DID_OK << 16) | rhdr->cmd_status;

		} else