lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 240/245] memory: fsl_ifc: fix leak of private memory on probe failure
    Date
    From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

    [ Upstream commit 8e0d09b1232d0538066c40ed4c13086faccbdff6 ]

    On probe error the driver should free the memory allocated for private
    structure. Fix this by using resource-managed allocation.

    Fixes: a20cbdeffce2 ("powerpc/fsl: Add support for Integrated Flash Controller")
    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
    Link: https://lore.kernel.org/r/20210527154322.81253-2-krzysztof.kozlowski@canonical.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/memory/fsl_ifc.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c
    index 74bbbdc584f4..38b945eb410f 100644
    --- a/drivers/memory/fsl_ifc.c
    +++ b/drivers/memory/fsl_ifc.c
    @@ -109,7 +109,6 @@ static int fsl_ifc_ctrl_remove(struct platform_device *dev)
    iounmap(ctrl->gregs);

    dev_set_drvdata(&dev->dev, NULL);
    - kfree(ctrl);

    return 0;
    }
    @@ -221,7 +220,8 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)

    dev_info(&dev->dev, "Freescale Integrated Flash Controller\n");

    - fsl_ifc_ctrl_dev = kzalloc(sizeof(*fsl_ifc_ctrl_dev), GFP_KERNEL);
    + fsl_ifc_ctrl_dev = devm_kzalloc(&dev->dev, sizeof(*fsl_ifc_ctrl_dev),
    + GFP_KERNEL);
    if (!fsl_ifc_ctrl_dev)
    return -ENOMEM;

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-19 17:40    [W:4.154 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site