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

Commit 66a85155 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Fix NULL pointer reference when resetting adapter 



Points referencing local port structures didn't accommodate cases where
the localport may not be registered yet.

Add NULL pointer checks to logic.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b15bd3e6

drivers/scsi/lpfc/lpfc_nvme.c

+20 −16
Original line number Diff line number Diff line
@@ -364,10 +364,11 @@ lpfc_nvme_cmpl_gen_req(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe, 
	struct lpfc_dmabuf *buf_ptr;

	struct lpfc_nodelist *ndlp;



	lport = (struct lpfc_nvme_lport *)vport->localport->private;

	pnvme_lsreq = (struct nvmefc_ls_req *)cmdwqe->context2;

	status = bf_get(lpfc_wcqe_c_status, wcqe) & LPFC_IOCB_STATUS_MASK;



	if (vport->localport) {

		lport = (struct lpfc_nvme_lport *)vport->localport->private;

		if (lport) {

			atomic_inc(&lport->fc4NvmeLsCmpls);

			if (status) {
@@ -376,6 +377,7 @@ lpfc_nvme_cmpl_gen_req(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe, 
				atomic_inc(&lport->cmpl_ls_err);

			}

		}

	}



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

	lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC,
@@ -980,6 +982,7 @@ lpfc_nvme_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn, 
	rport = lpfc_ncmd->nrport;

	status = bf_get(lpfc_wcqe_c_status, wcqe);



	if (vport->localport) {

		lport = (struct lpfc_nvme_lport *)vport->localport->private;

		if (lport) {

			idx = lpfc_ncmd->cur_iocbq.hba_wqidx;
@@ -991,6 +994,7 @@ lpfc_nvme_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn, 
				atomic_inc(&lport->cmpl_fcp_err);

			}

		}

	}



	lpfc_nvmeio_data(phba, "NVME FCP CMPL: xri x%x stat x%x parm x%x\n",

			 lpfc_ncmd->cur_iocbq.sli4_xritag,