diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2019-11-18 23:55:45 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-17 20:08:30 +0100 |
| commit | b4edc7157b94dba1c2b0d867cfcdf38b5d1cd199 (patch) | |
| tree | ac0c893540e8cec7f82e92f8ea1f33ad481215df /drivers | |
| parent | 4abf4c49ec5b366b2978e0f4cb0ae61b75e408b0 (diff) | |
| download | linux-stable-b4edc7157b94dba1c2b0d867cfcdf38b5d1cd199.tar.gz linux-stable-b4edc7157b94dba1c2b0d867cfcdf38b5d1cd199.tar.bz2 linux-stable-b4edc7157b94dba1c2b0d867cfcdf38b5d1cd199.zip | |
Revert "scsi: qla2xxx: Fix memory leak when sending I/O fails"
[ Upstream commit 5a993e507ee65a28eca6690ee11868555c4ca46b ]
This reverts commit 2f856d4e8c23f5ad5221f8da4a2f22d090627f19.
This patch was found to introduce a double free regression. The issue
it originally attempted to address was fixed in patch
f45bca8c5052 ("scsi: qla2xxx: Fix double scsi_done for abort path").
Link: https://lore.kernel.org/r/4BDE2B95-835F-43BE-A32C-2629D7E03E0A@marvell.com
Requested-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 6be453985a12..484045e4d194 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -947,8 +947,6 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) qc24_host_busy_free_sp: sp->free(sp); - CMD_SP(cmd) = NULL; - qla2x00_rel_sp(sp); qc24_host_busy: return SCSI_MLQUEUE_HOST_BUSY; @@ -1038,8 +1036,6 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd, qc24_host_busy_free_sp: sp->free(sp); - CMD_SP(cmd) = NULL; - qla2xxx_rel_qpair_sp(sp->qpair, sp); qc24_host_busy: return SCSI_MLQUEUE_HOST_BUSY; |