From: Davidlohr Bueso <dave@gnu.org>
Date: Sun, 6 May 2012 12:10:25 +0000 (+0200)
Subject: fdisk: sgi: abort on HDIO_GETGEO failure
X-Git-Tag: v2.22-rc1~424
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50f6100a960d96471980a9a5354d9ee426b00673;p=thirdparty%2Futil-linux.git

fdisk: sgi: abort on HDIO_GETGEO failure

When the HDIO_GETGEO ioctl fails on non IRIX/MIPS platforms (ie: inappropriate
ioctl for device) the variables that describe the geometry are compromissed.
One clear example is a division by 0 bug because the cylinder size is 0 is
verify_sgi():

$> fdisk sgi.img
Welcome to fdisk (util-linux 2.21.392-4b1c).

...

Command (m for help): x

Expert command (m for help): g
Building a new SGI disklabel.
Partition 11 of type SGI volume and of size 7.9 MiB is set
Floating point exception

Fix this by simply exiting the program instead of leaving it in a vulnerable
state.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c
index 822f55d971..5e851bc8e9 100644
--- a/fdisk/fdisksgilabel.c
+++ b/fdisk/fdisksgilabel.c
@@ -705,25 +705,26 @@ create_sgilabel(void)
 	res = blkdev_get_sectors(fd, &llsectors);
 
 #ifdef HDIO_GETGEO
-	if (!ioctl(fd, HDIO_GETGEO, &geometry)) {
-		heads = geometry.heads;
-		sectors = geometry.sectors;
-		if (res == 0) {
-			/* the get device size ioctl was successful */
-			unsigned long long llcyls;
-			llcyls = llsectors / (heads * sectors * sec_fac);
-			cylinders = llcyls;
-			if (cylinders != llcyls)	/* truncated? */
-				cylinders = ~0;
-		} else {
-			/* otherwise print error and use truncated version */
-			cylinders = geometry.cylinders;
-			fprintf(stderr,
-				_("Warning:  BLKGETSIZE ioctl failed on %s.  "
-				  "Using geometry cylinder value of %d.\n"
-				  "This value may be truncated for devices"
-				  " > 33.8 GB.\n"), disk_device, cylinders);
-		}
+	if (ioctl(fd, HDIO_GETGEO, &geometry) < 0)
+		err(EXIT_FAILURE, _("HDIO_GETGEO ioctl failed on %s"), disk_device);
+
+	heads = geometry.heads;
+	sectors = geometry.sectors;
+	if (res == 0) {
+		/* the get device size ioctl was successful */
+		unsigned long long llcyls;
+		llcyls = llsectors / (heads * sectors * sec_fac);
+		cylinders = llcyls;
+		if (cylinders != llcyls)	/* truncated? */
+			cylinders = ~0;
+	} else {
+		/* otherwise print error and use truncated version */
+		cylinders = geometry.cylinders;
+		fprintf(stderr,
+			_("Warning:  BLKGETSIZE ioctl failed on %s.  "
+			  "Using geometry cylinder value of %d.\n"
+			  "This value may be truncated for devices"
+			  " > 33.8 GB.\n"), disk_device, cylinders);
 	}
 #endif
 	for (i = 0; i < 4; i++) {