summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2017-11-13 21:00:32 +0000
committerkrw <krw@openbsd.org>2017-11-13 21:00:32 +0000
commit2a122e652f6d6a7b323681073f82146cb4ebaa12 (patch)
tree0e937712b62ddf9c47a863afd65f66ea22066c00
parenttweak previous; (diff)
downloadwireguard-openbsd-2a122e652f6d6a7b323681073f82146cb4ebaa12.tar.xz
wireguard-openbsd-2a122e652f6d6a7b323681073f82146cb4ebaa12.zip
Constrain MBR partition offsets to 0 .. disk.size - 1.
Issue reported by Alexi Malinin via bugs@. Thanks!
-rw-r--r--sbin/fdisk/cmd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c
index 37acb4dad1b..c467056e0b8 100644
--- a/sbin/fdisk/cmd.c
+++ b/sbin/fdisk/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.97 2016/09/03 17:46:19 krw Exp $ */
+/* $OpenBSD: cmd.c,v 1.98 2017/11/13 21:00:32 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -268,7 +268,7 @@ Xedit(char *args, struct mbr *mbr)
/* Fix up CHS values for LBA */
PRT_fix_CHS(pp);
} else {
- pp->bs = getuint64("Partition offset", pp->bs, 0, disk.size);
+ pp->bs = getuint64("Partition offset", pp->bs, 0, disk.size - 1);
pp->ns = getuint64("Partition size", pp->ns, 1,
disk.size - pp->bs);