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.17 104/343] scsi: pm8001: Fix task leak in pm8001_send_abort_all()
    Date
    From: Damien Le Moal <damien.lemoal@opensource.wdc.com>

    [ Upstream commit f90a74892f3acf0cdec5844e90fc8686ca13e7d7 ]

    In pm8001_send_abort_all(), make sure to free the allocated sas task
    if pm8001_tag_alloc() or pm8001_mpi_build_cmd() fail.

    Link: https://lore.kernel.org/r/20220220031810.738362-21-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 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
    index d244231e62f9..5ec429cf1e20 100644
    --- a/drivers/scsi/pm8001/pm8001_hwi.c
    +++ b/drivers/scsi/pm8001/pm8001_hwi.c
    @@ -1765,7 +1765,6 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha,
    }

    task = sas_alloc_slow_task(GFP_ATOMIC);
    -
    if (!task) {
    pm8001_dbg(pm8001_ha, FAIL, "cannot allocate task\n");
    return;
    @@ -1774,8 +1773,10 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha,
    task->task_done = pm8001_task_done;

    res = pm8001_tag_alloc(pm8001_ha, &ccb_tag);
    - if (res)
    + if (res) {
    + sas_free_task(task);
    return;
    + }

    ccb = &pm8001_ha->ccb_info[ccb_tag];
    ccb->device = pm8001_ha_dev;
    @@ -1792,8 +1793,10 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha,

    ret = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &task_abort,
    sizeof(task_abort), 0);
    - if (ret)
    + if (ret) {
    + sas_free_task(task);
    pm8001_tag_free(pm8001_ha, ccb_tag);
    + }

    }

    --
    2.35.1


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