From: Karel Zak <kzak@redhat.com>
Date: Thu, 3 Apr 2014 10:28:53 +0000 (+0200)
Subject: libfdisk: fix freesapce detection for nested partitions
X-Git-Tag: v2.25-rc1~337
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fd7160e831b15424b49b1b4073b0aa44b6bdfc6;p=thirdparty%2Futil-linux.git

libfdisk: fix freesapce detection for nested partitions

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libfdisk/src/table.c b/libfdisk/src/table.c
index e83ffaf4dc..59f6ab430f 100644
--- a/libfdisk/src/table.c
+++ b/libfdisk/src/table.c
@@ -421,6 +421,7 @@ static int check_container_freespace(struct fdisk_context *cxt,
 	struct fdisk_iter itr;
 	struct fdisk_partition *pa;
 	uint64_t x, last, grain;
+	uint64_t lastplusoff;
 	int rc = 0;
 
 	assert(cxt);
@@ -428,17 +429,17 @@ static int check_container_freespace(struct fdisk_context *cxt,
 	assert(tb);
 	assert(cont);
 
-	last = fdisk_partition_get_start(cont) + cxt->first_lba;
+	last = fdisk_partition_get_start(cont);
 	grain = cxt->grain > cxt->sector_size ?	cxt->grain / cxt->sector_size : 1;
 	fdisk_reset_iter(&itr, FDISK_ITER_FORWARD);
 
 	while (fdisk_table_next_partition(parts, &itr, &pa) == 0) {
-		uint64_t lastfree;
 		if (!pa->used || !fdisk_partition_is_nested(pa))
 			continue;
-		lastfree = pa->start - 1 - cxt->first_lba;
-		if (last + grain <= lastfree)
-			rc = table_add_freespace(cxt, tb, last + grain, lastfree, cont);
+
+		lastplusoff = last + cxt->first_lba;
+		if (pa->start > lastplusoff && pa->start - lastplusoff > grain)
+			rc = table_add_freespace(cxt, tb, lastplusoff, pa->start, cont);
 		if (rc)
 			return rc;
 		last = pa->end;
@@ -446,8 +447,9 @@ static int check_container_freespace(struct fdisk_context *cxt,
 
 	/* free-space remaining in extended partition */
 	x = fdisk_partition_get_start(cont) + fdisk_partition_get_size(cont) - 1;
-	if (last + grain < x)
-		rc = table_add_freespace(cxt, tb, last + grain, x - 1, cont);
+	lastplusoff = last + cxt->first_lba;
+	if (lastplusoff < x && x - lastplusoff > grain)
+		rc = table_add_freespace(cxt, tb, lastplusoff, x, cont);
 	return rc;
 }