From: Christopher Cordahi Date: Mon, 17 Dec 2012 00:59:30 +0000 (-0500) Subject: mtd: cmdlinepart: skip partitions truncated to zero X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ebf4f0707df410a7666ec409ee68dc068db56e97;p=openwrt%2Fstaging%2Fblogic.git mtd: cmdlinepart: skip partitions truncated to zero Perform flash size truncation before skipping zero sized partition so that if the result is a zero sized, it will be skipped like the others. Signed-off-by: Christopher Cordahi Acked-by: Shmulik Ladkani Signed-off-by: Artem Bityutskiy --- diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c index c1efb4c1d3d2..525c5795d4f5 100644 --- a/drivers/mtd/cmdlinepart.c +++ b/drivers/mtd/cmdlinepart.c @@ -330,6 +330,14 @@ static int parse_cmdline_partitions(struct mtd_info *master, if (part->parts[i].size == SIZE_REMAINING) part->parts[i].size = master->size - offset; + if (offset + part->parts[i].size > master->size) { + printk(KERN_WARNING ERRP + "%s: partitioning exceeds flash size, truncating\n", + part->mtd_id); + part->parts[i].size = master->size - offset; + } + offset += part->parts[i].size; + if (part->parts[i].size == 0) { printk(KERN_WARNING ERRP "%s: skipping zero sized partition\n", @@ -338,16 +346,7 @@ static int parse_cmdline_partitions(struct mtd_info *master, memmove(&part->parts[i], &part->parts[i + 1], sizeof(*part->parts) * (part->num_parts - i)); i--; - continue; } - - if (offset + part->parts[i].size > master->size) { - printk(KERN_WARNING ERRP - "%s: partitioning exceeds flash size, truncating\n", - part->mtd_id); - part->parts[i].size = master->size - offset; - } - offset += part->parts[i].size; } *pparts = kmemdup(part->parts, sizeof(*part->parts) * part->num_parts,