| From 6188a048604b0d855babdf6a24dab5d8772264d8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 27 May 2021 11:43:21 -0400 |
| Subject: memory: fsl_ifc: fix leak of IO mapping on probe failure |
| |
| 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 89f99b5b6450..a6324044a085 100644 |
| --- a/drivers/memory/fsl_ifc.c |
| +++ b/drivers/memory/fsl_ifc.c |
| @@ -219,8 +219,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")) { |
| @@ -295,6 +294,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 |
| |
