| From 61cbb269cd543d121b385fedb185b581baabbc8d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 27 May 2021 11:43:22 -0400 |
| Subject: memory: fsl_ifc: fix leak of private memory on probe failure |
| |
| 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 a6324044a085..d062c2f8250f 100644 |
| --- a/drivers/memory/fsl_ifc.c |
| +++ b/drivers/memory/fsl_ifc.c |
| @@ -97,7 +97,6 @@ static int fsl_ifc_ctrl_remove(struct platform_device *dev) |
| iounmap(ctrl->gregs); |
| |
| dev_set_drvdata(&dev->dev, NULL); |
| - kfree(ctrl); |
| |
| return 0; |
| } |
| @@ -209,7 +208,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 |
| |
