libfdisk: verify partno from template

* verify partno from template when create a new partition
* remove unnecessary l->ext_offset check

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

diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index c7c7772e8ff9963ec8d62e3c5151c65320c0f0e7..0c2006ed6f593a9e1f1d2ce3aa79801c8c9fd2d7 100644 (file)
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -1548,7 +1548,7 @@ static int dos_add_partition(struct fdisk_context *cxt,
                }
 
        /* pa specifies start, but outside extended partition */
-       } else if (pa && fdisk_partition_has_start(pa) && l->ext_offset) {
+       } else if (pa && fdisk_partition_has_start(pa)) {
                DBG(LABEL, ul_debug("DOS: pa template %p: add primary", pa));
                rc = get_partition_unused_primary(cxt, pa, &res);
                if (rc == 0) {

diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c
index f507f20e36c8c7ed17689a7b5cb83daad7db3f2e..1e8c1eb32862114ff92fa1f5624986542bf438d6 100644 (file)
--- a/libfdisk/src/partition.c
+++ b/libfdisk/src/partition.c
@@ -733,7 +733,8 @@ int fdisk_partition_next_partno(
 
                DBG(PART, ul_debugobj(pa, "next partno (specified=%zu)", pa->partno));
 
-               if (pa->partno >= cxt->label->nparts_max)
+               if (pa->partno >= cxt->label->nparts_max ||
+                   fdisk_is_partition_used(cxt, pa->partno))
                        return -ERANGE;
                *n = pa->partno;
        } else