diff options
| author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2015-07-30 12:18:03 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-09-30 18:49:07 +0200 |
| commit | e5bae86797141e4a95e42d825f737cb36d7b8c37 (patch) | |
| tree | f07430dbc26281a376259e8f410d1b4463b88615 /drivers/mtd/mtdpart.c | |
| parent | Revert "mtd: mtdram: check offs and len in mtdram->erase" (diff) | |
| download | linux-e5bae86797141e4a95e42d825f737cb36d7b8c37.tar.xz linux-e5bae86797141e4a95e42d825f737cb36d7b8c37.zip | |
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@free-electrons.com>
Cc: stable@vger.kernel.org
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/mtdpart.c')
| -rw-r--r-- | drivers/mtd/mtdpart.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index cafdb8855a79..919a936abc42 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); |