diff mbox series

scsi: qla2xxx: Remove duplicate fcport release in error handler

Message ID 20241230065041.67315-1-haoqinhuang7@gmail.com
State New
Headers show
Series scsi: qla2xxx: Remove duplicate fcport release in error handler | expand

Commit Message

haoqinhuang Dec. 30, 2024, 6:50 a.m. UTC 
From: haoqinhuang <haoqinhuang@tencent.com>

After calling function qla2x00_sp_release(), the system automatically
executes the function qla2x00_free_fcport(sp->fcport).

A closer inspection of qla2x00_sp_release() reveals that it triggers a
call to sp->free(sp), where sp->free points to qla2x00_els_dcmd_sp_free.
In function qla2x00_els_dcmd_sp_free(), if sp->fcport exists,
qla2x00_free_fcport(sp->fcport) is triggered.

Given this sequence of events, calling qla2x00_free_fcport(sp->fcport)
again during qla2x00_sp_release() is duplicate. This redundant call
should be eliminated.

Fixes: 82f522ae0d97 ("scsi: qla2xxx: Fix double free of fcport")
Signed-off-by: Haisu Wang <haisuwang@tencent.com>
Signed-off-by: haoqinhuang <haoqinhuang@tencent.com>
---
 drivers/scsi/qla2xxx/qla_iocb.c | 2 --
 1 file changed, 2 deletions(-)
diff mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 0b41e8a06602..faec66bd1951 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -2751,7 +2751,6 @@  qla24xx_els_dcmd_iocb(scsi_qla_host_t *vha, int els_opcode,
 	if (!elsio->u.els_logo.els_logo_pyld) {
 		/* ref: INIT */
 		kref_put(&sp->cmd_kref, qla2x00_sp_release);
-		qla2x00_free_fcport(fcport);
 		return QLA_FUNCTION_FAILED;
 	}
 
@@ -2776,7 +2775,6 @@  qla24xx_els_dcmd_iocb(scsi_qla_host_t *vha, int els_opcode,
 	if (rval != QLA_SUCCESS) {
 		/* ref: INIT */
 		kref_put(&sp->cmd_kref, qla2x00_sp_release);
-		qla2x00_free_fcport(fcport);
 		return QLA_FUNCTION_FAILED;
 	}