leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MTD] physmap: fix leak of memory returned by parse_mtd_partitions

Browse Source 
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:
Atsushi Nemoto 2008-12-01 14:23:39 -08:00 committed by David Woodhouse
parent 002f6aab43
commit 176bf2e0f1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/mtd/maps/physmap.c
View File

@ -29,7 +29,6 @@ struct physmap_flash_info {
struct map_info map[MAX_RESOURCES]; struct map_info map[MAX_RESOURCES];
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS
int nr_parts; int nr_parts;
struct mtd_partition *parts;
#endif #endif
}; };
@ -56,14 +55,10 @@ static int physmap_flash_remove(struct platform_device *dev)
for (i = 0; i < MAX_RESOURCES; i++) { for (i = 0; i < MAX_RESOURCES; i++) {
if (info->mtd[i] != NULL) { if (info->mtd[i] != NULL) {
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS
if (info->nr_parts) { if (info->nr_parts || physmap_data->nr_parts)
del_mtd_partitions(info->mtd[i]); del_mtd_partitions(info->mtd[i]);
kfree(info->parts); else
} else if (physmap_data->nr_parts) {
del_mtd_partitions(info->mtd[i]);
} else {
del_mtd_device(info->mtd[i]); del_mtd_device(info->mtd[i]);
}
#else #else
del_mtd_device(info->mtd[i]); del_mtd_device(info->mtd[i]);
#endif #endif
@ -86,6 +81,9 @@ static int physmap_flash_probe(struct platform_device *dev)
int err = 0; int err = 0;
int i; int i;
int devices_found = 0; int devices_found = 0;
#ifdef CONFIG_MTD_PARTITIONS
struct mtd_partition *parts;
#endif
physmap_data = dev->dev.platform_data; physmap_data = dev->dev.platform_data;
if (physmap_data == NULL) if (physmap_data == NULL)
@ -163,9 +161,10 @@ static int physmap_flash_probe(struct platform_device *dev)
goto err_out; goto err_out;
#ifdef CONFIG_MTD_PARTITIONS #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) { if (err > 0) {
add_mtd_partitions(info->cmtd, info->parts, err); add_mtd_partitions(info->cmtd, parts, err);
kfree(parts);
return 0; return 0;
} }