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.4 184/188] memory: fsl_ifc: fix leak of IO mapping on probe failure
    Date
    From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

    [ Upstream commit 3b132ab67fc7a358fff35e808fa65d4bea452521 ]

    On probe error the driver should unmap the IO memory. Smatch reports:

    drivers/memory/fsl_ifc.c:298 fsl_ifc_ctrl_probe() warn: 'fsl_ifc_ctrl_dev->gregs' not released on lines: 298.

    Fixes: a20cbdeffce2 ("powerpc/fsl: Add support for Integrated Flash Controller")
    Reported-by: kernel test robot <lkp@intel.com>
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
    Link: https://lore.kernel.org/r/20210527154322.81253-1-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 acd1460cf787..040be4638140 100644
    --- a/drivers/memory/fsl_ifc.c
    +++ b/drivers/memory/fsl_ifc.c
    @@ -228,8 +228,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)
    fsl_ifc_ctrl_dev->regs = of_iomap(dev->dev.of_node, 0);
    if (!fsl_ifc_ctrl_dev->regs) {
    dev_err(&dev->dev, "failed to get memory region\n");
    - ret = -ENODEV;
    - goto err;
    + return -ENODEV;
    }

    version = ifc_in32(&fsl_ifc_ctrl_dev->regs->ifc_rev) &
    @@ -306,6 +305,7 @@ err_irq:
    free_irq(fsl_ifc_ctrl_dev->irq, fsl_ifc_ctrl_dev);
    irq_dispose_mapping(fsl_ifc_ctrl_dev->irq);
    err:
    + iounmap(fsl_ifc_ctrl_dev->gregs);
    return ret;
    }

    --
    2.30.2


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