scsi: qla2xxx: Fix SRB leak on switch command timeout

[ Upstream commit af2a0c51b1205327f55a7e82e530403ae1d42cbb ]

when GPSC/GPDB switch command fails, driver just returns without doing a
proper cleanup. This patch fixes this memory leak by calling sp->free() in
the error path.

Link: https://lore.kernel.org/r/20191105150657.8092-4-hmadhani@marvell.com
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index dec521d726d91024bf29a345466e2a5eeb9cc7a1..97ca95cd174bc5337dd252d0d061b30280f64ea1 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3029,7 +3029,7 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)
        fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE);
 
        if (res == QLA_FUNCTION_TIMEOUT)
-               return;
+               goto done;
 
        if (res == (DID_ERROR << 16)) {
                /* entry status error */

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index d4e381f81997b949190c94bf37ead705825b3230..b84afef37f70b9c30e0979d55b88032b3b2069a9 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1169,13 +1169,11 @@ void qla24xx_async_gpdb_sp_done(void *s, int res)
            "Async done-%s res %x, WWPN %8phC mb[1]=%x mb[2]=%x \n",
            sp->name, res, fcport->port_name, mb[1], mb[2]);
 
-       if (res == QLA_FUNCTION_TIMEOUT) {
-               dma_pool_free(sp->vha->hw->s_dma_pool, sp->u.iocb_cmd.u.mbx.in,
-                       sp->u.iocb_cmd.u.mbx.in_dma);
-               return;
-       }
-
        fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE);
+
+       if (res == QLA_FUNCTION_TIMEOUT)
+               goto done;
+
        memset(&ea, 0, sizeof(ea));
        ea.event = FCME_GPDB_DONE;
        ea.fcport = fcport;
@@ -1183,6 +1181,7 @@ void qla24xx_async_gpdb_sp_done(void *s, int res)
 
        qla2x00_fcport_event_handler(vha, &ea);
 
+done:
        dma_pool_free(ha->s_dma_pool, sp->u.iocb_cmd.u.mbx.in,
                sp->u.iocb_cmd.u.mbx.in_dma);
 

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 45548628c6f3e566dd9319420586380d1adb2700..8601e63e4698fd3a59f45f98e33ef5f8436d0db5 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -6285,17 +6285,13 @@ int qla24xx_send_mb_cmd(struct scsi_qla_host *vha, mbx_cmd_t *mcp)
        case  QLA_SUCCESS:
                ql_dbg(ql_dbg_mbx, vha, 0x119d, "%s: %s done.\n",
                    __func__, sp->name);
-               sp->free(sp);
                break;
        default:
                ql_dbg(ql_dbg_mbx, vha, 0x119e, "%s: %s Failed. %x.\n",
                    __func__, sp->name, rval);
-               sp->free(sp);
                break;
        }
 
-       return rval;
-
 done_free_sp:
        sp->free(sp);
 done:

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index b2977e49356ba1b0b1f4d8aaa4e8f433ddaa7712..0341dc0e06510c2d414a5801db9157a5243ca6b3 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -934,7 +934,7 @@ int qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
 
        sp = qla2x00_get_sp(base_vha, NULL, GFP_KERNEL);
        if (!sp)
-               goto done;
+               return rval;
 
        sp->type = SRB_CTRL_VP;
        sp->name = "ctrl_vp";
@@ -950,7 +950,7 @@ int qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
                ql_dbg(ql_dbg_async, vha, 0xffff,
                    "%s: %s Failed submission. %x.\n",
                    __func__, sp->name, rval);
-               goto done_free_sp;
+               goto done;
        }
 
        ql_dbg(ql_dbg_vport, vha, 0x113f, "%s hndl %x submitted\n",
@@ -968,16 +968,13 @@ int qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
        case QLA_SUCCESS:
                ql_dbg(ql_dbg_vport, vha, 0xffff, "%s: %s done.\n",
                    __func__, sp->name);
-               goto done_free_sp;
+               break;
        default:
                ql_dbg(ql_dbg_vport, vha, 0xffff, "%s: %s Failed. %x.\n",
                    __func__, sp->name, rval);
-               goto done_free_sp;
+               break;
        }
 done:
-       return rval;
-
-done_free_sp:
        sp->free(sp);
        return rval;
 }

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 0f51387ceebdf417159ba3570bcee781d1a1e0fe..d2e7a4e7b3a9af2bd2b1cabafbcc31a326f4f397 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1030,7 +1030,7 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd,
                ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x3078,
                    "Start scsi failed rval=%d for cmd=%p.\n", rval, cmd);
                if (rval == QLA_INTERFACE_ERROR)
-                       goto qc24_fail_command;
+                       goto qc24_free_sp_fail_command;
                goto qc24_host_busy_free_sp;
        }
 
@@ -1047,6 +1047,11 @@ qc24_host_busy:
 qc24_target_busy:
        return SCSI_MLQUEUE_TARGET_BUSY;
 
+qc24_free_sp_fail_command:
+       sp->free(sp);
+       CMD_SP(cmd) = NULL;
+       qla2xxx_rel_qpair_sp(sp->qpair, sp);
+
 qc24_fail_command:
        cmd->scsi_done(cmd);