From: Arun Easi <arun.easi@qlogic.com>
Date: Tue, 20 Dec 2011 17:48:04 +0000 (-0800)
Subject: qla2xxx: Fix wrong decrement, null sp access.
X-Git-Tag: v2.6.39-400.9.0~423^2~79
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a32cfe62a237e5e5c04ceb4b01f763cebb329be1;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Fix wrong decrement, null sp access.

JIRA Key: V2632FC-135
---

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index e48718e2aa88..7804470ece90 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1828,44 +1828,43 @@ qla2x00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt)
 	uint32_t sense_len;
 	uint8_t *sense_ptr;
 
+	if (!sp || !GET_CMD_SENSE_LEN(sp))
+		return;
+
 	sense_len = GET_CMD_SENSE_LEN(sp);
 	sense_ptr = GET_CMD_SENSE_PTR(sp);
 
-	if (sp != NULL && sense_len != 0) {
-		cp = GET_CMD_SP(sp);
-		if (cp == NULL) {
-			ql_log(ql_log_warn, vha, 0x3025,
-			    "cmd is NULL: already returned to OS (sp=%p).\n",
-			    sp);
+	cp = GET_CMD_SP(sp);
+	if (cp == NULL) {
+		ql_log(ql_log_warn, vha, 0x3025,
+		    "cmd is NULL: already returned to OS (sp=%p).\n", sp);
 
-			rsp->status_srb = NULL;
-			return;
-		}
+		rsp->status_srb = NULL;
+		return;
+	}
 
-		if (sense_len > sizeof(pkt->data)) {
-			sense_sz = sizeof(pkt->data);
-		} else {
-			sense_sz = sense_len;
-		}
+	if (sense_len > sizeof(pkt->data))
+		sense_sz = sizeof(pkt->data);
+	else
+		sense_sz = sense_len;
 
-		/* Move sense data. */
-		if (IS_FWI2_CAPABLE(ha))
-			host_to_fcp_swap(pkt->data, sizeof(pkt->data));
-		memcpy(sense_ptr, pkt->data, sense_sz);
-		ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x302c,
-			sense_ptr, sense_sz);
+	/* Move sense data. */
+	if (IS_FWI2_CAPABLE(ha))
+		host_to_fcp_swap(pkt->data, sizeof(pkt->data));
+	memcpy(sense_ptr, pkt->data, sense_sz);
+	ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x302c,
+		sense_ptr, sense_sz);
 
-		sense_len =- sense_sz;
-		sense_ptr += sense_sz;
+	sense_len -= sense_sz;
+	sense_ptr += sense_sz;
 
-		SET_CMD_SENSE_PTR(sp, sense_ptr);
-		SET_CMD_SENSE_LEN(sp, sense_len);
+	SET_CMD_SENSE_PTR(sp, sense_ptr);
+	SET_CMD_SENSE_LEN(sp, sense_len);
 
-		/* Place command on done queue. */
-		if (sense_len == 0) {
-			rsp->status_srb = NULL;
-			sp->done(ha, sp, 0);
-		}
+	/* Place command on done queue. */
+	if (sense_len == 0) {
+		rsp->status_srb = NULL;
+		sp->done(ha, sp, 0);
 	}
 }