From 1d1ac122c05ecde44e079c74ee8d595eeeb1d9a1 Mon Sep 17 00:00:00 2001 From: Christopher Cordahi Date: Sun, 16 Dec 2012 19:59:30 -0500 Subject: [PATCH] --- yaml --- r: 360341 b: refs/heads/master c: ebf4f0707df410a7666ec409ee68dc068db56e97 h: refs/heads/master i: 360339: 48391419be00f304234ef21400cd9ec634dc7ec8 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/cmdlinepart.c | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 429505a475a4..66f46efbe67d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e25e0a4de1237972a86e5831c8659c4068ff23f7 +refs/heads/master: ebf4f0707df410a7666ec409ee68dc068db56e97 diff --git a/trunk/drivers/mtd/cmdlinepart.c b/trunk/drivers/mtd/cmdlinepart.c index c1efb4c1d3d2..525c5795d4f5 100644 --- a/trunk/drivers/mtd/cmdlinepart.c +++ b/trunk/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,