aboutsummaryrefslogtreecommitdiff
path: root/stand/i386
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2022-09-08 00:35:06 +0000
committerKyle Evans <kevans@FreeBSD.org>2022-09-08 15:05:08 +0000
commit72291cee075d9ef1a608b2a67762b44e024cc0d4 (patch)
tree55e651d2773c77a3a374d0da254c20638a4fd713 /stand/i386
parent7d90ce7cae63a8121da0acc3ce36a713a98d6033 (diff)
downloadsrc-72291cee075d9ef1a608b2a67762b44e024cc0d4.tar.gz
src-72291cee075d9ef1a608b2a67762b44e024cc0d4.zip
stand: i386: take into account disk sector size for blk calculation
disk_blocks assumes BIOSDISK_SECSIZE, but the media may not be using it. In particular, bioscd on Parallels presents a 2K sector size, so we end up with a short disk_blocks and subsequent validation fails when trying to read /boot/lua. PR: 233098 Reviewed by: imp, tsoome MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D36490
Diffstat (limited to 'stand/i386')
-rw-r--r--stand/i386/libi386/biosdisk.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/stand/i386/libi386/biosdisk.c b/stand/i386/libi386/biosdisk.c
index 3539d206d011..1b6134ab2e6b 100644
--- a/stand/i386/libi386/biosdisk.c
+++ b/stand/i386/libi386/biosdisk.c
@@ -1032,7 +1032,8 @@ bd_realstrategy(void *devdata, int rw, daddr_t dblk, size_t size,
d_offset = dev->d_offset;
}
if (disk_blocks == 0)
- disk_blocks = bd->bd_sectors - d_offset;
+ disk_blocks = bd->bd_sectors * (bd->bd_sectorsize /
+ BIOSDISK_SECSIZE) - d_offset;
/* Validate source block address. */
if (dblk < d_offset || dblk >= d_offset + disk_blocks)