summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris BREZILLON <boris.brezillon@free-electrons.com>2015-07-30 12:18:03 +0200
committerBen Hutchings <ben@decadent.org.uk>2015-11-27 12:48:19 +0000
commitf9ac3882c96ad4d554be337d28ea202988b68b3d (patch)
tree7cebc23ea2ef3d5b08b05e6007c70ea18bede356
parenta6a8977eadc2a96aef3af051d020ed7cb9331d1a (diff)
downloadlwn-f9ac3882c96ad4d554be337d28ea202988b68b3d.tar.gz
lwn-f9ac3882c96ad4d554be337d28ea202988b68b3d.zip
mtd: mtdpart: fix add_mtd_partitions error path
commit e5bae86797141e4a95e42d825f737cb36d7b8c37 upstream. If we fail to allocate a partition structure in the middle of the partition creation process, the already allocated partitions are never removed, which means they are still present in the partition list and their resources are never freed. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/mtd/mtdpart.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 198da0a980ed..3aab083574f7 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -671,8 +671,10 @@ int add_mtd_partitions(struct mtd_info *master,
for (i = 0; i < nbparts; i++) {
slave = allocate_partition(master, parts + i, i, cur_offset);
- if (IS_ERR(slave))
+ if (IS_ERR(slave)) {
+ del_mtd_partitions(master);
return PTR_ERR(slave);
+ }
mutex_lock(&mtd_partitions_mutex);
list_add(&slave->list, &mtd_partitions);