memory: fsl_ifc: fix leak of IO mapping on probe failure
authorKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Thu, 27 May 2021 15:43:21 +0000 (11:43 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:17:55 +0000 (16:17 +0200)
[ 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

index 1b182b117f9cf3fbcacfcd9a3e343a3d66e47ab2..74bbbdc584f4ae20d20d1ff0e2e94712340f1c3c 100644 (file)
@@ -231,8 +231,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)
        fsl_ifc_ctrl_dev->gregs = of_iomap(dev->dev.of_node, 0);
        if (!fsl_ifc_ctrl_dev->gregs) {
                dev_err(&dev->dev, "failed to get memory region\n");
-               ret = -ENODEV;
-               goto err;
+               return -ENODEV;
        }
 
        if (of_property_read_bool(dev->dev.of_node, "little-endian")) {
@@ -308,6 +307,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;
 }