summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/boot/Makefile.version2
-rw-r--r--usr/src/boot/sys/boot/common/disk.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version
index fcf8fcba05..04e89bb2ad 100644
--- a/usr/src/boot/Makefile.version
+++ b/usr/src/boot/Makefile.version
@@ -33,4 +33,4 @@ LOADER_VERSION = 1.1
# Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
# The version is processed from left to right, the version number can only
# be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2019.04.15.1
+BOOT_VERSION = $(LOADER_VERSION)-2019.05.05.1
diff --git a/usr/src/boot/sys/boot/common/disk.c b/usr/src/boot/sys/boot/common/disk.c
index 9e70f5256d..e04974270e 100644
--- a/usr/src/boot/sys/boot/common/disk.c
+++ b/usr/src/boot/sys/boot/common/disk.c
@@ -229,6 +229,10 @@ disk_open(struct disk_devdesc *dev, uint64_t mediasize, uint_t sectorsize)
struct ptable_entry part;
int rc, slice, partition;
+ if (sectorsize == 0) {
+ DEBUG("unknown sector size");
+ return (ENXIO);
+ }
rc = 0;
/*
* While we are reading disk metadata, make sure we do it relative