1 files changed, 10 insertions, 4 deletions

diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 5fcd1cdb7056..3de7004e0f41 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1329,20 +1329,26 @@ getvirginlabel(void)
 	if (dkname[0] == '/') {
 		fprintf(stderr,
 		"\"auto\" requires the usage of a canonical disk name.\n");
-		return (NULL);
+		return 0;
 	}
 	(void)snprintf(namebuf, BBSIZE, "%sr%s", _PATH_DEV, dkname);
 	if ((f = open(namebuf, O_RDONLY, 0)) == -1) {
 		Perror("open()");
-		return (NULL);
+		return 0;
 	}
 	if (ioctl(f, DIOCGDINFO, &lab) < 0) {
 		Perror("ioctl DIOCGDINFO");
 		close(f);
-		return (NULL);
+		return 0;
 	}
 	close(f);
-	return (&lab);
+	/* insert reasonable defaults where necessary */
+	if (lab.d_npartitions < 8) lab.d_npartitions = 8;
+	if (lab.d_bbsize == 0) lab.d_bbsize = BBSIZE;
+	if (lab.d_sbsize == 0) lab.d_sbsize = SBSIZE;
+	if (lab.d_rpm == 0) lab.d_rpm = 3600;
+	if (lab.d_interleave == 0) lab.d_interleave = 1;
+	return &lab;
 }