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

Commit 7207fea4 authored by Boaz Harrosh's avatar Boaz Harrosh Committed by James Bottomley
Browse files

[SCSI] iscsi: Prettify resid handling and some extra checks 



  - Check to see that OVERFLOW is not negative indicating
    a bug.
  - Unify handling of UNDERFLOW and OVERFLOW to the same
    code.
  - Also handle BIDI_OVERFLOW.

Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent da32dd68

drivers/scsi/iscsi_tcp.c

+7 −9
Original line number Diff line number Diff line
@@ -507,22 +507,20 @@ iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask) 
	}



	if (rhdr->flags & ISCSI_FLAG_DATA_STATUS) {

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

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

		if (rhdr->flags & ISCSI_FLAG_DATA_UNDERFLOW) {

		if (rhdr->flags & (ISCSI_FLAG_DATA_UNDERFLOW |

		                   ISCSI_FLAG_DATA_OVERFLOW)) {

			int res_count = be32_to_cpu(rhdr->residual_count);



			if (res_count > 0 &&

			    res_count <= scsi_bufflen(sc)) {

			    (rhdr->flags & ISCSI_FLAG_CMD_OVERFLOW ||

			     res_count <= scsi_bufflen(sc)))

				scsi_set_resid(sc, res_count);

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

			} else

			else

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

					rhdr->cmd_status;

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

			scsi_set_resid(sc, be32_to_cpu(rhdr->residual_count));

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

		} else

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

		}

	}



	conn->datain_pdus_cnt++;

drivers/scsi/libiscsi.c

+7 −5
Original line number Diff line number Diff line
@@ -291,17 +291,19 @@ static void iscsi_scsi_cmd_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 
			   min_t(uint16_t, senselen, SCSI_SENSE_BUFFERSIZE));

	}



	if (rhdr->flags & ISCSI_FLAG_CMD_UNDERFLOW) {

	if (rhdr->flags & (ISCSI_FLAG_CMD_UNDERFLOW |

	                   ISCSI_FLAG_CMD_OVERFLOW)) {

		int res_count = be32_to_cpu(rhdr->residual_count);



		if (res_count > 0 && res_count <= scsi_bufflen(sc))

		if (res_count > 0 &&

		    (rhdr->flags & ISCSI_FLAG_CMD_OVERFLOW ||

		     res_count <= scsi_bufflen(sc)))

			scsi_set_resid(sc, res_count);

		else

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

	} else if (rhdr->flags & ISCSI_FLAG_CMD_BIDI_UNDERFLOW)

	} else if (rhdr->flags & (ISCSI_FLAG_CMD_BIDI_UNDERFLOW |

	                          ISCSI_FLAG_CMD_BIDI_OVERFLOW))

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

	else if (rhdr->flags & ISCSI_FLAG_CMD_OVERFLOW)

		scsi_set_resid(sc, be32_to_cpu(rhdr->residual_count));



out:

	debug_scsi("done [sc %lx res %d itt 0x%x]\n",