[PATCH v6 01/10] mtd: physmap_of: Release resources on error

[Ricardo Ribalda Delgado <ricardo.ribalda@xxxxxxxxx>]

During probe, if there was an error the memory region and the memory
map were not properly released.

This can lead a system unusable if deferred probe is in use.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@xxxxxxxxx>
---
 drivers/mtd/maps/physmap_of_core.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/maps/physmap_of_core.c b/drivers/mtd/maps/physmap_of_core.c
index 4129535b8e46..062add8b3a6e 100644
--- a/drivers/mtd/maps/physmap_of_core.c
+++ b/drivers/mtd/maps/physmap_of_core.c
@@ -241,10 +241,10 @@ static int of_flash_probe(struct platform_device *dev)
 
 		err = of_flash_probe_gemini(dev, dp, &info->list[i].map);
 		if (err)
-			goto err_out;
+			goto err_out_release;
 		err = of_flash_probe_versatile(dev, dp, &info->list[i].map);
 		if (err)
-			goto err_out;
+			goto err_out_release;
 
 		err = -ENOMEM;
 		info->list[i].map.virt = ioremap(info->list[i].map.phys,
@@ -252,7 +252,7 @@ static int of_flash_probe(struct platform_device *dev)
 		if (!info->list[i].map.virt) {
 			dev_err(&dev->dev, "Failed to ioremap() flash"
 				" region\n");
-			goto err_out;
+			goto err_out_release;
 		}
 
 		simple_map_init(&info->list[i].map);
@@ -290,7 +290,7 @@ static int of_flash_probe(struct platform_device *dev)
 		err = -ENXIO;
 		if (!info->list[i].mtd) {
 			dev_err(&dev->dev, "do_map_probe() failed\n");
-			goto err_out;
+			goto err_out_iounmap;
 		} else {
 			info->list_size++;
 		}
@@ -329,6 +329,10 @@ static int of_flash_probe(struct platform_device *dev)
 
 	return 0;
 
+err_out_iounmap:
+	iounmap(info->list[i].map.virt);
+err_out_release:
+	release_mem_region(res.start, resource_size(&res));
 err_out:
 	kfree(mtd_list);
 err_flash_remove:
-- 
2.19.0


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/