diff mbox series

mtd: fix memory leak in pxa2xx_flash_probe()

Message ID 20221119073307.22929-1-zhengyongjun3@huawei.com
State Accepted
Headers show
Series mtd: fix memory leak in pxa2xx_flash_probe() | expand

Commit Message

Zheng Yongjun Nov. 19, 2022, 7:33 a.m. UTC 
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 <zhengyongjun3@huawei.com>
---
 drivers/mtd/maps/pxa2xx-flash.c | 2 ++
 1 file changed, 2 insertions(+)

--
2.17.1

Comments

Miquel Raynal Nov. 24, 2022, 11:36 a.m. UTC | #1 
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 <zhengyongjun3@huawei.com>

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

Miquel
diff mbox series

Patch

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;