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

Commit 64a8c501 authored by Quinn Tran's avatar Quinn Tran Committed by Greg Kroah-Hartman
Browse files

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: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarQuinn Tran <qutran@marvell.com>
Signed-off-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f3a14d03

drivers/scsi/qla2xxx/qla_gs.c

+1 −1
Original line number Diff line number Diff line
@@ -3264,7 +3264,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 */

drivers/scsi/qla2xxx/qla_init.c

+5 −6
Original line number Diff line number Diff line
@@ -982,13 +982,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;
@@ -996,6 +994,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);

drivers/scsi/qla2xxx/qla_mbx.c

+0 −4
Original line number Diff line number Diff line
@@ -6131,17 +6131,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:

drivers/scsi/qla2xxx/qla_mid.c

+4 −7
Original line number Diff line number Diff line
@@ -931,7 +931,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";
@@ -946,7 +946,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",
@@ -962,16 +962,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;

}

drivers/scsi/qla2xxx/qla_os.c

+6 −1
Original line number Diff line number Diff line
@@ -1029,7 +1029,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;

	}
@@ -1044,6 +1044,11 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd, 
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);