The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=72291cee075d9ef1a608b2a67762b44e024cc0d4
commit 72291cee075d9ef1a608b2a67762b44e024cc0d4 Author: Kyle Evans <[email protected]> AuthorDate: 2022-09-08 00:35:06 +0000 Commit: Kyle Evans <[email protected]> CommitDate: 2022-09-08 15:05:08 +0000 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 --- stand/i386/libi386/biosdisk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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)
