ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Karel Zak 2017-02-17 13:15:09 +01:00
parent 9dc5644717
commit e1cfb30466
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfdisk/src/dos.c
View File

@ -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) {

3
libfdisk/src/partition.c
View File

@ -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