scsi: qla2xxx: Correct error handling during initialization failures

Current code misses or fails to account for proper recovery during early
initialization failures:

 - Properly unwind allocations during probe() failures.

 - Protect against non-initialization memory allocations during
   unwinding.

 - Propagate error status during HW initialization.

 - Release SCSI host reference when memory allocations fail.

Signed-off-by: Andrew Vasquez <andrewv@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 02bbc5bdaa4352ba6e0695b98686bfae8337a642..1a8b4a587e0f72a4f26d399984e000feaa87408b 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2293,6 +2293,10 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
        if (qla_ini_mode_enabled(vha) || qla_dual_mode_enabled(vha))
                rval = qla2x00_init_rings(vha);
 
+       /* No point in continuing if firmware initialization failed. */
+       if (rval != QLA_SUCCESS)
+               return rval;
+
        ha->flags.chip_reset_done = 1;
 
        if (rval == QLA_SUCCESS && IS_QLA84XX(ha)) {

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 769a2ffea79fa1835165961c21568b5f76de5f26..73655c81ab77d4fc31f516e4b988b2ef95df1ca8 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1809,8 +1809,13 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)
        int que;
        struct qla_hw_data *ha = vha->hw;
 
+       /* Continue only if initialization complete. */
+       if (!ha->base_qpair)
+               return;
        __qla2x00_abort_all_cmds(ha->base_qpair, res);
 
+       if (!ha->queue_pair_map)
+               return;
        for (que = 0; que < ha->max_qpairs; que++) {
                if (!ha->queue_pair_map[que])
                        continue;
@@ -3163,6 +3168,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                ql_log(ql_log_fatal, base_vha, 0x003d,
                    "Failed to allocate memory for queue pointers..."
                    "aborting.\n");
+               ret = -ENODEV;
                goto probe_failed;
        }
 
@@ -4717,7 +4723,7 @@ qla2x00_mem_free(struct qla_hw_data *ha)
        mempool_destroy(ha->ctx_mempool);
        ha->ctx_mempool = NULL;
 
-       if (ql2xenabledif) {
+       if (ql2xenabledif && ha->dif_bundl_pool) {
                struct dsd_dma *dsd, *nxt;
 
                list_for_each_entry_safe(dsd, nxt, &ha->pool.unusable.head,
@@ -4812,7 +4818,7 @@ struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht,
        if (!vha->gnl.l) {
                ql_log(ql_log_fatal, vha, 0xd04a,
                    "Alloc failed for name list.\n");
-               scsi_remove_host(vha->host);
+               scsi_host_put(vha->host);
                return NULL;
        }
 
@@ -4824,7 +4830,7 @@ struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht,
                    "Alloc failed for scan database.\n");
                dma_free_coherent(&ha->pdev->dev, vha->gnl.size,
                    vha->gnl.l, vha->gnl.ldma);
-               scsi_remove_host(vha->host);
+               scsi_host_put(vha->host);
                return NULL;
        }
        INIT_DELAYED_WORK(&vha->scan.scan_work, qla_scan_work_fn);