Commit 578079fa authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Protect access to qpair members with qpair->qp_lock 



In qla2xx_start_scsi_mq() and qla2xx_dif_start_scsi_mq() we grab the
qpair->qp_lock but do access members of the qpair before having the lock.
Re-order the locking sequence to have all read and write access to qpair
members under the qpair->qp_lock.

Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Acked-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f62f9ffd

drivers/scsi/qla2xxx/qla_iocb.c

+13 −10
Original line number Diff line number Diff line
@@ -1770,6 +1770,9 @@ qla2xxx_start_scsi_mq(srb_t *sp) 
	struct qla_hw_data *ha = vha->hw;

	struct qla_qpair *qpair = sp->qpair;



	/* Acquire qpair specific lock */

	spin_lock_irqsave(&qpair->qp_lock, flags);



	/* Setup qpair pointers */

	rsp = qpair->rsp;

	req = qpair->req;
@@ -1779,15 +1782,14 @@ qla2xxx_start_scsi_mq(srb_t *sp) 


	/* Send marker if required */

	if (vha->marker_needed != 0) {

		if (qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=

		    QLA_SUCCESS)

		if (__qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=

		    QLA_SUCCESS) {

			spin_unlock_irqrestore(&qpair->qp_lock, flags);

			return QLA_FUNCTION_FAILED;

		}

		vha->marker_needed = 0;

	}



	/* Acquire qpair specific lock */

	spin_lock_irqsave(&qpair->qp_lock, flags);



	/* Check for room in outstanding command list. */

	handle = req->current_outstanding_cmd;

	for (index = 1; index < req->num_outstanding_cmds; index++) {
@@ -1942,6 +1944,8 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp) 
			return qla2xxx_start_scsi_mq(sp);

	}



	spin_lock_irqsave(&qpair->qp_lock, flags);



	/* Setup qpair pointers */

	rsp = qpair->rsp;

	req = qpair->req;
@@ -1951,15 +1955,14 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp) 


	/* Send marker if required */

	if (vha->marker_needed != 0) {

		if (qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=

		    QLA_SUCCESS)

		if (__qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=

		    QLA_SUCCESS) {

			spin_unlock_irqrestore(&qpair->qp_lock, flags);

			return QLA_FUNCTION_FAILED;

		}

		vha->marker_needed = 0;

	}



	/* Acquire ring specific lock */

	spin_lock_irqsave(&qpair->qp_lock, flags);



	/* Check for room in outstanding command list. */

	handle = req->current_outstanding_cmd;

	for (index = 1; index < req->num_outstanding_cmds; index++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE