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

Commit 78d19465 authored by James Smart's avatar James Smart Committed by Greg Kroah-Hartman
Browse files

scsi: lpfc: Fix crash when a REG_RPI mailbox fails triggering a LOGO response 

[ Upstream commit fffd18ec6579c2d9c72b212169259062fe747888 ]

Fix a crash caused by a double put on the node when the driver completed an
ACC for an unsolicted abort on the same node.  The second put was executed
by lpfc_nlp_not_used() and is wrong because the completion routine executes
the nlp_put when the iocbq was released.  Additionally, the driver is
issuing a LOGO then immediately calls lpfc_nlp_set_state to put the node
into NPR.  This call does nothing.

Remove the lpfc_nlp_not_used call and additional set_state in the
completion routine.  Remove the lpfc_nlp_set_state post issue_logo.  Isn't
necessary.

Link: https://lore.kernel.org/r/20210412013127.2387-3-jsmart2021@gmail.com


Co-developed-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5a63a025

drivers/scsi/lpfc/lpfc_nportdisc.c

+0 −2
Original line number Diff line number Diff line
@@ -1743,8 +1743,6 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport, 
		ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;



		lpfc_issue_els_logo(vport, ndlp, 0);

		ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;

		lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);

		return ndlp->nlp_state;

	}

drivers/scsi/lpfc/lpfc_sli.c

+0 −1
Original line number Diff line number Diff line
@@ -17018,7 +17018,6 @@ lpfc_sli4_seq_abort_rsp_cmpl(struct lpfc_hba *phba, 
	if (cmd_iocbq) {

		ndlp = (struct lpfc_nodelist *)cmd_iocbq->context1;

		lpfc_nlp_put(ndlp);

		lpfc_nlp_not_used(ndlp);

		lpfc_sli_release_iocbq(phba, cmd_iocbq);

	}