renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-15 17:14:00 +08:00
Code

scsi: pm8001: Fix tag leaks on error

Browse Source 
In pm8001_chip_set_dev_state_req(), pm8001_chip_fw_flash_update_req(),
pm80xx_chip_phy_ctl_req() and pm8001_chip_reg_dev_req() add missing calls
to pm8001_tag_free() to free the allocated tag when pm8001_mpi_build_cmd()
fails.

Similarly, in pm8001_exec_internal_task_abort(), if the chip ->task_abort
method fails, the tag allocated for the abort request task must be
freed. Add the missing call to pm8001_tag_free().

Link: https://lore.kernel.org/r/20220220031810.738362-22-damien.lemoal@opensource.wdc.com
Reviewed-by: John Garry <john.garry@huawei.com>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Damien Le Moal 2022-02-20 12:18:00 +09:00 committed by Martin K. Petersen
parent f90a74892f
commit 4c8f04b190
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/pm8001/pm8001_hwi.c
View File

@ -4458,6 +4458,9 @@ static int pm8001_chip_reg_dev_req(struct pm8001_hba_info *pm8001_ha,
SAS_ADDR_SIZE); SAS_ADDR_SIZE);
rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload, rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload,
sizeof(payload), 0); sizeof(payload), 0);
if (rc)
pm8001_tag_free(pm8001_ha, tag);
return rc; return rc;
} }
@ -4870,6 +4873,9 @@ pm8001_chip_fw_flash_update_req(struct pm8001_hba_info *pm8001_ha,
ccb->ccb_tag = tag; ccb->ccb_tag = tag;
rc = pm8001_chip_fw_flash_update_build(pm8001_ha, &flash_update_info, rc = pm8001_chip_fw_flash_update_build(pm8001_ha, &flash_update_info,
tag); tag);
if (rc)
pm8001_tag_free(pm8001_ha, tag);
return rc; return rc;
} }
@ -4974,6 +4980,9 @@ pm8001_chip_set_dev_state_req(struct pm8001_hba_info *pm8001_ha,
payload.nds = cpu_to_le32(state); payload.nds = cpu_to_le32(state);
rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload, rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload,
sizeof(payload), 0); sizeof(payload), 0);
if (rc)
pm8001_tag_free(pm8001_ha, tag);
return rc; return rc;
} }

2
drivers/scsi/pm8001/pm8001_sas.c
View File

@ -738,10 +738,10 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,
res = PM8001_CHIP_DISP->task_abort(pm8001_ha, res = PM8001_CHIP_DISP->task_abort(pm8001_ha,
pm8001_dev, flag, task_tag, ccb_tag); pm8001_dev, flag, task_tag, ccb_tag);
if (res) { if (res) {
del_timer(&task->slow_task->timer); del_timer(&task->slow_task->timer);
pm8001_dbg(pm8001_ha, FAIL, "Executing internal task failed\n"); pm8001_dbg(pm8001_ha, FAIL, "Executing internal task failed\n");
pm8001_tag_free(pm8001_ha, ccb_tag);
goto ex_err; goto ex_err;
} }
wait_for_completion(&task->slow_task->completion); wait_for_completion(&task->slow_task->completion);

7
drivers/scsi/pm8001/pm80xx_hwi.c
View File

@ -4915,8 +4915,13 @@ static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha,
payload.tag = cpu_to_le32(tag); payload.tag = cpu_to_le32(tag);
payload.phyop_phyid = payload.phyop_phyid =
cpu_to_le32(((phy_op & 0xFF) << 8) | (phyId & 0xFF)); cpu_to_le32(((phy_op & 0xFF) << 8) | (phyId & 0xFF));
return pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload,
rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload,
sizeof(payload), 0); sizeof(payload), 0);
if (rc)
pm8001_tag_free(pm8001_ha, tag);
return rc;
} }
static u32 pm80xx_chip_is_our_interrupt(struct pm8001_hba_info *pm8001_ha) static u32 pm80xx_chip_is_our_interrupt(struct pm8001_hba_info *pm8001_ha)