Commit d58ab5cf authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Linus Torvalds

mtd: physmap: fix NULL pointer dereference in error path

commit e480814f ("[MTD] [MAPS] physmap:
fix wrong free and del_mtd_{partition,device}") introduces a NULL pointer
dereference in physmap_flash_remove when called from the error path in
physmap_flash_probe (if map_probe failed).

Call del_mtd_{partition,device} only if info->cmtd was not NULL.
Reported-by: default avatarpHilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9c1e8a4e
...@@ -46,16 +46,19 @@ static int physmap_flash_remove(struct platform_device *dev) ...@@ -46,16 +46,19 @@ static int physmap_flash_remove(struct platform_device *dev)
physmap_data = dev->dev.platform_data; physmap_data = dev->dev.platform_data;
if (info->cmtd) {
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS
if (info->nr_parts) { if (info->nr_parts || physmap_data->nr_parts)
del_mtd_partitions(info->cmtd); del_mtd_partitions(info->cmtd);
kfree(info->parts); else
} else if (physmap_data->nr_parts) del_mtd_device(info->cmtd);
del_mtd_partitions(info->cmtd);
else
del_mtd_device(info->cmtd);
#else #else
del_mtd_device(info->cmtd); del_mtd_device(info->cmtd);
#endif
}
#ifdef CONFIG_MTD_PARTITIONS
if (info->nr_parts)
kfree(info->parts);
#endif #endif
#ifdef CONFIG_MTD_CONCAT #ifdef CONFIG_MTD_CONCAT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment