lkml.org 
[lkml]   [2022]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 073/285] scsi: pm8001: Fix tag leaks on error
    Date
    From: Damien Le Moal <damien.lemoal@opensource.wdc.com>

    [ Upstream commit 4c8f04b1905cd4b776d0b720463c091545478ef7 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/pm8001/pm8001_hwi.c | 9 +++++++++
    drivers/scsi/pm8001/pm8001_sas.c | 2 +-
    drivers/scsi/pm8001/pm80xx_hwi.c | 9 +++++++--
    3 files changed, 17 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
    index 7351e767b68d..e447b714df2b 100644
    --- a/drivers/scsi/pm8001/pm8001_hwi.c
    +++ b/drivers/scsi/pm8001/pm8001_hwi.c
    @@ -4492,6 +4492,9 @@ static int pm8001_chip_reg_dev_req(struct pm8001_hba_info *pm8001_ha,
    SAS_ADDR_SIZE);
    rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload,
    sizeof(payload), 0);
    + if (rc)
    + pm8001_tag_free(pm8001_ha, tag);
    +
    return rc;
    }

    @@ -4904,6 +4907,9 @@ pm8001_chip_fw_flash_update_req(struct pm8001_hba_info *pm8001_ha,
    ccb->ccb_tag = tag;
    rc = pm8001_chip_fw_flash_update_build(pm8001_ha, &flash_update_info,
    tag);
    + if (rc)
    + pm8001_tag_free(pm8001_ha, tag);
    +
    return rc;
    }

    @@ -5008,6 +5014,9 @@ pm8001_chip_set_dev_state_req(struct pm8001_hba_info *pm8001_ha,
    payload.nds = cpu_to_le32(state);
    rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload,
    sizeof(payload), 0);
    + if (rc)
    + pm8001_tag_free(pm8001_ha, tag);
    +
    return rc;

    }
    diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
    index c0b45b8a513d..2a9ea08c7fe6 100644
    --- a/drivers/scsi/pm8001/pm8001_sas.c
    +++ b/drivers/scsi/pm8001/pm8001_sas.c
    @@ -831,10 +831,10 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,

    res = PM8001_CHIP_DISP->task_abort(pm8001_ha,
    pm8001_dev, flag, task_tag, ccb_tag);
    -
    if (res) {
    del_timer(&task->slow_task->timer);
    pm8001_dbg(pm8001_ha, FAIL, "Executing internal task failed\n");
    + pm8001_tag_free(pm8001_ha, ccb_tag);
    goto ex_err;
    }
    wait_for_completion(&task->slow_task->completion);
    diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
    index 00498e3660e1..d7c88d0f1899 100644
    --- a/drivers/scsi/pm8001/pm80xx_hwi.c
    +++ b/drivers/scsi/pm8001/pm80xx_hwi.c
    @@ -4928,8 +4928,13 @@ static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha,
    payload.tag = cpu_to_le32(tag);
    payload.phyop_phyid =
    cpu_to_le32(((phy_op & 0xFF) << 8) | (phyId & 0xFF));
    - return pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload,
    - sizeof(payload), 0);
    +
    + rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload,
    + 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)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-04-12 09:49    [W:4.105 / U:1.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site