[MTD] physmap: fix leak of memory returned by parse_mtd_partitions
The mtd partition parser returns an allocated pointer array of mtd_partition. The caller must free it. The array is used only for add_mtd_partitions(), so free it just after the call. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Cc: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
parent
002f6aab43
commit
176bf2e0f1
|
@ -29,7 +29,6 @@ struct physmap_flash_info {
|
|||
struct map_info map[MAX_RESOURCES];
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
int nr_parts;
|
||||
struct mtd_partition *parts;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -56,14 +55,10 @@ static int physmap_flash_remove(struct platform_device *dev)
|
|||
for (i = 0; i < MAX_RESOURCES; i++) {
|
||||
if (info->mtd[i] != NULL) {
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
if (info->nr_parts) {
|
||||
if (info->nr_parts || physmap_data->nr_parts)
|
||||
del_mtd_partitions(info->mtd[i]);
|
||||
kfree(info->parts);
|
||||
} else if (physmap_data->nr_parts) {
|
||||
del_mtd_partitions(info->mtd[i]);
|
||||
} else {
|
||||
else
|
||||
del_mtd_device(info->mtd[i]);
|
||||
}
|
||||
#else
|
||||
del_mtd_device(info->mtd[i]);
|
||||
#endif
|
||||
|
@ -86,6 +81,9 @@ static int physmap_flash_probe(struct platform_device *dev)
|
|||
int err = 0;
|
||||
int i;
|
||||
int devices_found = 0;
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
struct mtd_partition *parts;
|
||||
#endif
|
||||
|
||||
physmap_data = dev->dev.platform_data;
|
||||
if (physmap_data == NULL)
|
||||
|
@ -163,9 +161,10 @@ static int physmap_flash_probe(struct platform_device *dev)
|
|||
goto err_out;
|
||||
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
err = parse_mtd_partitions(info->cmtd, part_probe_types, &info->parts, 0);
|
||||
err = parse_mtd_partitions(info->cmtd, part_probe_types, &parts, 0);
|
||||
if (err > 0) {
|
||||
add_mtd_partitions(info->cmtd, info->parts, err);
|
||||
add_mtd_partitions(info->cmtd, parts, err);
|
||||
kfree(parts);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue