diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2022-09-08 00:35:06 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2022-09-17 19:32:52 +0000 |
| commit | 8a832ed2f8c1f87f6461d7a6932cec357b04e538 (patch) | |
| tree | a12947246389356d16cecc0decf7f4cad1bd474a | |
| parent | 6ef5bf8c21aa06b451422c1ba94aa8c8ae186c56 (diff) | |
| download | src-8a832ed2f8c1f87f6461d7a6932cec357b04e538.tar.gz src-8a832ed2f8c1f87f6461d7a6932cec357b04e538.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
(cherry picked from commit 72291cee075d9ef1a608b2a67762b44e024cc0d4)
| -rw-r--r-- | stand/i386/libi386/biosdisk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stand/i386/libi386/biosdisk.c b/stand/i386/libi386/biosdisk.c index 00d2de5de418..15e71348bb87 100644 --- a/stand/i386/libi386/biosdisk.c +++ b/stand/i386/libi386/biosdisk.c @@ -1025,7 +1025,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) |