Skip to content

Commit

Permalink
Revert "scsi: qla2xxx: Fix memory leak when sending I/O fails"
Browse files Browse the repository at this point in the history
This reverts commit 2f856d4.

This patch was found to introduce a double free regression. The issue
it originally attempted to address was fixed in patch
f45bca8 ("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>
  • Loading branch information
Martin K. Petersen committed Nov 20, 2019
1 parent 0b7a223 commit 5a993e5
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions drivers/scsi/qla2xxx/qla_os.c
Original file line number Diff line number Diff line change
Expand Up @@ -909,8 +909,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_target_busy:
return SCSI_MLQUEUE_TARGET_BUSY;
Expand Down Expand Up @@ -994,8 +992,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_target_busy:
return SCSI_MLQUEUE_TARGET_BUSY;
Expand Down

0 comments on commit 5a993e5

Please sign in to comment.