lkml.org 
[lkml]   [2020]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 29/30] scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del()
    Date
    From: Javed Hasan <jhasan@marvell.com>

    [ Upstream commit e95b4789ff4380733006836d28e554dc296b2298 ]

    In fcoe_sysfs_fcf_del(), we first deleted the fcf from the list and then
    freed it if ctlr_dev was not NULL. This was causing a memory leak.

    Free the fcf even if ctlr_dev is NULL.

    Link: https://lore.kernel.org/r/20200729081824.30996-3-jhasan@marvell.com
    Reviewed-by: Girish Basrur <gbasrur@marvell.com>
    Reviewed-by: Santosh Vernekar <svernekar@marvell.com>
    Reviewed-by: Saurav Kashyap <skashyap@marvell.com>
    Reviewed-by: Shyam Sundar <ssundar@marvell.com>
    Signed-off-by: Javed Hasan <jhasan@marvell.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/fcoe/fcoe_ctlr.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
    index d95ba1a07ba3b..eaab59afd90c7 100644
    --- a/drivers/scsi/fcoe/fcoe_ctlr.c
    +++ b/drivers/scsi/fcoe/fcoe_ctlr.c
    @@ -267,9 +267,9 @@ static void fcoe_sysfs_fcf_del(struct fcoe_fcf *new)
    WARN_ON(!fcf_dev);
    new->fcf_dev = NULL;
    fcoe_fcf_device_delete(fcf_dev);
    - kfree(new);
    mutex_unlock(&cdev->lock);
    }
    + kfree(new);
    }

    /**
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-08-21 18:24    [W:4.088 / U:0.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site