mtd: mtdpart: fix add_mtd_partitions error path

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=e5bae86797141e4a95e42d825f737cb36d7b8c37
Commit:     e5bae86797141e4a95e42d825f737cb36d7b8c37
Parent:     d489ff42db9179647004ca2b12c614cb71ac81ea
Author:     Boris BREZILLON <boris.brezillon at free-electrons.com>
AuthorDate: Thu Jul 30 12:18:03 2015 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed Sep 30 09:49:07 2015 -0700

    mtd: mtdpart: fix add_mtd_partitions error path
    
    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 at free-electrons.com>
    Cc: stable at vger.kernel.org
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/mtdpart.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index cafdb88..919a936 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -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);