2022-11-19 08:13:37

by Zheng Yongjun

Subject: [PATCH] mtd: fix memory leak in pxa2xx_flash_probe()

If '!info->map.virt' or '!info->mtd' success, 'info' should be
freed before return. Otherwise there is a memory leak.

Fixes: e644f7d62894 ("[MTD] MAPS: Merge Lubbock and Mainstone drivers into common PXA2xx driver")
Signed-off-by: Zheng Yongjun <[email protected]>
---
drivers/mtd/maps/pxa2xx-flash.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 1749dbbacc13..62a5bf41a6d7 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -64,6 +64,7 @@ static int pxa2xx_flash_probe(struct platform_device *pdev)
if (!info->map.virt) {
printk(KERN_WARNING "Failed to ioremap %s\n",
info->map.name);
+ kfree(info);
return -ENOMEM;
}
info->map.cached = ioremap_cache(info->map.phys, info->map.size);
@@ -85,6 +86,7 @@ static int pxa2xx_flash_probe(struct platform_device *pdev)
iounmap((void *)info->map.virt);
if (info->map.cached)
iounmap(info->map.cached);
+ kfree(info);
return -EIO;
}
info->mtd->dev.parent = &pdev->dev;
--
2.17.1

2022-11-24 12:07:08

by Miquel Raynal

Subject: Re: [PATCH] mtd: fix memory leak in pxa2xx_flash_probe()

On Sat, 2022-11-19 at 07:33:07 UTC, Zheng Yongjun wrote:
> If '!info->map.virt' or '!info->mtd' success, 'info' should be
> freed before return. Otherwise there is a memory leak.
>
> Fixes: e644f7d62894 ("[MTD] MAPS: Merge Lubbock and Mainstone drivers into common PXA2xx driver")
> Signed-off-by: Zheng Yongjun <[email protected]>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Miquel