diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-11-25 19:32:36 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-11-25 19:32:36 +0000 |
| commit | 170bf529c3a10527e67c223cc8381dfff21f2133 (patch) | |
| tree | e8779a0b238978dd1490eeffd6aa927c8bf8a0d5 | |
| parent | c4ead86a275f3c32512535387f89f4ed93f7125b (diff) | |
Try harder to prevent 0-length partitions from being defined.
Suggested by & ok tim@
| -rw-r--r-- | sbin/fdisk/cmd.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c index 5481966566b..29a154ecfdc 100644 --- a/sbin/fdisk/cmd.c +++ b/sbin/fdisk/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.90 2015/11/21 16:45:41 krw Exp $ */ +/* $OpenBSD: cmd.c,v 1.91 2015/11/25 19:32:35 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -190,7 +190,7 @@ Xgedit(char *args) bs = getuint64("Partition offset", letoh64(gg->gp_lba_start), letoh64(gh.gh_lba_start), letoh64(gh.gh_lba_end)); ns = getuint64("Partition size", letoh64(gg->gp_lba_end) - bs + 1, - 0, letoh64(gh.gh_lba_end) - bs + 1); + 1, letoh64(gh.gh_lba_end) - bs + 1); gg->gp_lba_start = htole64(bs); gg->gp_lba_end = htole64(bs + ns - 1); @@ -255,12 +255,13 @@ Xedit(char *args, struct mbr *mbr) pp->ssect = ask_num("BIOS Starting sector", pp->ssect, 1, disk.sectors); - pp->ecyl = ask_num("BIOS Ending cylinder", pp->ecyl, 0, - disk.cylinders - 1); - pp->ehead = ask_num("BIOS Ending head", pp->ehead, 0, - disk.heads - 1); - pp->esect = ask_num("BIOS Ending sector", pp->esect, 1, - disk.sectors); + pp->ecyl = ask_num("BIOS Ending cylinder", pp->ecyl, + pp->scyl, disk.cylinders - 1); + pp->ehead = ask_num("BIOS Ending head", pp->ehead, + (pp->scyl == pp->ecyl) ? pp->shead : 0, disk.heads - 1); + pp->esect = ask_num("BIOS Ending sector", pp->esect, + (pp->scyl == pp->ecyl && pp->shead == pp->ehead) ? pp->ssect + : 1, disk.sectors); /* Fix up off/size values */ PRT_fix_BN(pp, pn); @@ -268,7 +269,7 @@ Xedit(char *args, struct mbr *mbr) PRT_fix_CHS(pp); } else { pp->bs = getuint64("Partition offset", pp->bs, 0, disk.size); - pp->ns = getuint64("Partition size", pp->ns, 0, + pp->ns = getuint64("Partition size", pp->ns, 1, disk.size - pp->bs); /* Fix up CHS values */ |