Hi Ricardo, On Thu, 4 Oct 2018 15:01:01 +0200 Ricardo Ribalda Delgado <[email protected]> wrote:
> 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 <[email protected]> > --- > 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: Please fix that using devm_ioremap_resource() instead. Thanks, Boris
