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

Commit a629852a authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.32: Correct null pointer Error in lpfc_sli.c 

This patch corrects the issue caught via Smatch and reported by Dan Carpenter:
http://marc.info/?l=linux-scsi&m=133693516103343



Resolve null pointer check ordering that were odd

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAlex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 4f4c1863

drivers/scsi/lpfc/lpfc_sli.c

+7 −13
Original line number Diff line number Diff line
@@ -15863,24 +15863,18 @@ lpfc_drain_txq(struct lpfc_hba *phba) 
		spin_lock_irqsave(&phba->hbalock, iflags);



		piocbq = lpfc_sli_ringtx_get(phba, pring);

		sglq = __lpfc_sli_get_sglq(phba, piocbq);

		if (!sglq) {

			__lpfc_sli_ringtx_put(phba, pring, piocbq);

			spin_unlock_irqrestore(&phba->hbalock, iflags);

			break;

		} else {

		if (!piocbq) {

				/* The txq_cnt out of sync. This should

				 * never happen

				 */

				sglq = __lpfc_clear_active_sglq(phba,

						 sglq->sli4_lxritag);

			spin_unlock_irqrestore(&phba->hbalock, iflags);

			lpfc_printf_log(phba, KERN_ERR, LOG_SLI,

				"2823 txq empty and txq_cnt is %d\n ",

				pring->txq_cnt);

			break;

		}

		sglq = __lpfc_sli_get_sglq(phba, piocbq);

		if (!sglq) {

			__lpfc_sli_ringtx_put(phba, pring, piocbq);

			spin_unlock_irqrestore(&phba->hbalock, iflags);

			break;

		}



		/* The xri and iocb resources secured,