lpfc: Fix OS crash when running loopback test in applications

Signed-off-by: Dick Kennedy <dick.kennedy@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 6b4cf315619e1cf7f141c280076de0012dae13a9..a056666e59d996caf40b71518ede2f909ffffdb6 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -3194,6 +3194,7 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)
                cmd->unsli3.rcvsli3.ox_id = 0xffff;
        }
        cmdiocbq->iocb_flag |= LPFC_IO_LIBDFC;
+       cmdiocbq->iocb_flag |= LPFC_IO_LOOPBACK;
        cmdiocbq->vport = phba->pport;
        cmdiocbq->iocb_cmpl = NULL;
        iocb_stat = lpfc_sli_issue_iocb_wait(phba, LPFC_ELS_RING, cmdiocbq,

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index c76c2a1e41e49d79cd744dc71e6feb7219fc3581..48919d0e31c77c77581d204f844522151a64846f 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -918,12 +918,16 @@ __lpfc_sli_get_sglq(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq)
                lpfc_cmd = (struct lpfc_scsi_buf *) piocbq->context1;
                ndlp = lpfc_cmd->rdata->pnode;
        } else  if ((piocbq->iocb.ulpCommand == CMD_GEN_REQUEST64_CR) &&
-                       !(piocbq->iocb_flag & LPFC_IO_LIBDFC))
+                       !(piocbq->iocb_flag & LPFC_IO_LIBDFC)) {
                ndlp = piocbq->context_un.ndlp;
-       else  if (piocbq->iocb_flag & LPFC_IO_LIBDFC)
-               ndlp = piocbq->context_un.ndlp;
-       else
+       } else  if (piocbq->iocb_flag & LPFC_IO_LIBDFC) {
+               if (piocbq->iocb_flag & LPFC_IO_LOOPBACK)
+                       ndlp = NULL;
+               else
+                       ndlp = piocbq->context_un.ndlp;
+       } else {
                ndlp = piocbq->context1;
+       }
 
        list_remove_head(lpfc_sgl_list, sglq, struct lpfc_sglq, list);
        start_sglq = sglq;

diff --git a/drivers/scsi/lpfc/lpfc_sli.h b/drivers/scsi/lpfc/lpfc_sli.h
index 4a01452415cf1c164278c0a8f127d8ca13be90f3..e8f9381734d25f18f16428ff752a5c85684bc60e 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.h
+++ b/drivers/scsi/lpfc/lpfc_sli.h
@@ -80,6 +80,7 @@ struct lpfc_iocbq {
 
 #define LPFC_IO_OAS            0x10000 /* OAS FCP IO */
 #define LPFC_IO_FOF            0x20000 /* FOF FCP IO */
+#define LPFC_IO_LOOPBACK       0x40000 /* Loopback IO */
 
        uint32_t drvrTimeout;   /* driver timeout in seconds */
        uint32_t fcp_wqidx;     /* index to FCP work queue */