lpfc: Fix pointer checks and comments in LS receive refactoring

Additional testing encountered null pointers that weren't fully qualified
in lpfc_nvmet_xmt_ls_abort_cmp() and lpfc_nvmet_unsol_issue_abort().

The same error was detected and reported by static checker reporting:
  drivers/scsi/lpfc/lpfc_sli.c:2905 lpfc_nvme_unsol_ls_handler()
  error: we previously assumed 'phba->targetport' could be null
    (see line 2837)

Fix by making phba->nvmet_support and phba->targetport validity checks
in lpfc_nvmet_xmt_ls_abort_cmp() and lpfc_nvmet_unsol_issue_abort().

Fixes: 3a8070c567aaa (“lpfc: Refactor NVME LS receive handling”)
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Paul Ely <paul.ely@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c
index 1c6bbbb..bccf9da 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nvmet.c
+++ b/drivers/scsi/lpfc/lpfc_nvmet.c
@@ -3207,8 +3207,10 @@ lpfc_nvmet_xmt_ls_abort_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe,
        ctxp = cmdwqe->context2;
        result = wcqe->parameter;
 
-       tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;
-       atomic_inc(&tgtp->xmt_ls_abort_cmpl);
+       if (phba->nvmet_support) {
+               tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;
+               atomic_inc(&tgtp->xmt_ls_abort_cmpl);
+       }
 
        lpfc_printf_log(phba, KERN_INFO, LOG_NVME_ABTS,
                        "6083 Abort cmpl: ctx x%px WCQE:%08x %08x %08x %08x\n",
@@ -3244,7 +3246,7 @@ lpfc_nvmet_unsol_issue_abort(struct lpfc_hba *phba,
                             struct lpfc_async_xchg_ctx *ctxp,
                             uint32_t sid, uint16_t xri)
 {
-       struct lpfc_nvmet_tgtport *tgtp;
+       struct lpfc_nvmet_tgtport *tgtp = NULL;
        struct lpfc_iocbq *abts_wqeq;
        union lpfc_wqe128 *wqe_abts;
        struct lpfc_nodelist *ndlp;
@@ -3253,13 +3255,15 @@ lpfc_nvmet_unsol_issue_abort(struct lpfc_hba *phba,
                        "6067 ABTS: sid %x xri x%x/x%x\n",
                        sid, xri, ctxp->wqeq->sli4_xritag);
 
-       tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;
+       if (phba->nvmet_support && phba->targetport)
+               tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;
 
        ndlp = lpfc_findnode_did(phba->pport, sid);
        if (!ndlp || !NLP_CHK_NODE_ACT(ndlp) ||
            ((ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&
            (ndlp->nlp_state != NLP_STE_MAPPED_NODE))) {
-               atomic_inc(&tgtp->xmt_abort_rsp_error);
+               if (tgtp)
+                       atomic_inc(&tgtp->xmt_abort_rsp_error);
                lpfc_printf_log(phba, KERN_ERR, LOG_NVME_ABTS,
                                "6134 Drop ABTS - wrong NDLP state x%x.\n",
                                (ndlp) ? ndlp->nlp_state : NLP_STE_MAX_STATE);
@@ -3538,7 +3542,7 @@ lpfc_nvme_unsol_ls_issue_abort(struct lpfc_hba *phba,
                                struct lpfc_async_xchg_ctx *ctxp,
                                uint32_t sid, uint16_t xri)
 {
-       struct lpfc_nvmet_tgtport *tgtp;
+       struct lpfc_nvmet_tgtport *tgtp = NULL;
        struct lpfc_iocbq *abts_wqeq;
        unsigned long flags;
        int rc;
@@ -3555,7 +3559,9 @@ lpfc_nvme_unsol_ls_issue_abort(struct lpfc_hba *phba,
                ctxp->state = LPFC_NVME_STE_LS_ABORT;
        }
 
-       tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;
+       if (phba->nvmet_support && phba->targetport)
+               tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;
+
        if (!ctxp->wqeq) {
                /* Issue ABTS for this WQE based on iotag */
                ctxp->wqeq = lpfc_sli_get_iocbq(phba);
@@ -3582,11 +3588,13 @@ lpfc_nvme_unsol_ls_issue_abort(struct lpfc_hba *phba,
        rc = lpfc_sli4_issue_wqe(phba, ctxp->hdwq, abts_wqeq);
        spin_unlock_irqrestore(&phba->hbalock, flags);
        if (rc == WQE_SUCCESS) {
-               atomic_inc(&tgtp->xmt_abort_unsol);
+               if (tgtp)
+                       atomic_inc(&tgtp->xmt_abort_unsol);
                return 0;
        }
 out:
-       atomic_inc(&tgtp->xmt_abort_rsp_error);
+       if (tgtp)
+               atomic_inc(&tgtp->xmt_abort_rsp_error);
        abts_wqeq->context2 = NULL;
        abts_wqeq->context3 = NULL;
        lpfc_sli_release_iocbq(phba, abts_wqeq);