mtd: mtdpart: fix add_mtd_partitions error path
authorBoris BREZILLON <boris.brezillon@free-electrons.com>
Thu, 30 Jul 2015 10:18:03 +0000 (12:18 +0200)
committerBrian Norris <computersforpeace@gmail.com>
Wed, 30 Sep 2015 16:49:07 +0000 (09:49 -0700)
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>
Cc: stable@vger.kernel.org
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/mtdpart.c

index cafdb8855a794f93f2adf56ca917fcb7a283e9df..919a936abc423f95d9f74e82ca22b9683402356f 100644 (file)
@@ -664,8 +664,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);