Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebf4f070 authored by Christopher Cordahi's avatar Christopher Cordahi Committed by Artem Bityutskiy
Browse files

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: default avatarChristopher Cordahi <christophercordahi@nanometrics.ca>
Acked-by: default avatarShmulik Ladkani <shmulik.ladkani@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent e25e0a4d

drivers/mtd/cmdlinepart.c

+8 −9
Original line number Diff line number Diff line
@@ -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,