From e55160fe10ffce82df8e39d6dda48ee9512bf066 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Fri, 8 Nov 2013 11:13:01 +0100 Subject: partitions: dos: improve guess of disk size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The code used to ineffectively take the end of the last partition as guess for the disk size. Better use the end of the partition that has its end rearmost. Also return an unsigned type instead of int as the result is always non-negative. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer --- common/partitions/dos.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'common/partitions') diff --git a/common/partitions/dos.c b/common/partitions/dos.c index 31b1ed60d1..2e39e7d816 100644 --- a/common/partitions/dos.c +++ b/common/partitions/dos.c @@ -27,19 +27,23 @@ * @param table partition table * @return sector count */ -static int disk_guess_size(struct device_d *dev, struct partition_entry *table) +static uint64_t disk_guess_size(struct device_d *dev, + struct partition_entry *table) { uint64_t size = 0; int i; for (i = 0; i < 4; i++) { - if (table[i].partition_start != 0) { - size += get_unaligned_le32(&table[i].partition_start) - size; - size += get_unaligned_le32(&table[i].partition_size); + if (get_unaligned_le32(&table[i].partition_start) != 0) { + uint64_t part_end = get_unaligned_le32(&table[i].partition_start) + + get_unaligned_le32(&table[i].partition_size); + + if (size < part_end) + size = part_end; } } - return (int)size; + return size; } static void *read_mbr(struct block_device *blk) -- cgit v1.2.3