From nobody Thu Sep 8 15:05:29 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MNj9Q290cz4cHGj; Thu, 8 Sep 2022 15:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MNj9Q1l9vz3NwM; Thu, 8 Sep 2022 15:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662649530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ac+orR1zIBOr439MRPh1gh5S9Fhk2W4TRwXevn+zovA=; b=b6KoTSsMIfLCIMFsUjZBpzntubj7MWV0Wq8C844c7dbY5E2YmSA/mdt9tbiUulVbpED/ly T3dQGm6RYnAMgm03w2xygcRpiSJBtxIHT1rOmeKs5MD/2hEZ1aRm0RW06ekPT7scmKT6Iq AGIMRyvhD/nPXq3dC9JAOQ5rpnPf8mknZz+GhS70s14BiHr2eZFwfOaX8d2dmV61I+OfZQ ocs7wCUYD+EE4PLrHi6VsWa3AoAY0N5AppuawzCu/Dua3YCbgTiwUlxLh0pcXrgr+gFDWn 3BhAylso08qSD25m3l7kh4aXkZP0tpLoS/opvf//mJ+Jwogqy94Br+LCIni4CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MNj9Q0ZMzzvBd; Thu, 8 Sep 2022 15:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 288F5TkP086819; Thu, 8 Sep 2022 15:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 288F5T5F086818; Thu, 8 Sep 2022 15:05:29 GMT (envelope-from git) Date: Thu, 8 Sep 2022 15:05:29 GMT Message-Id: <202209081505.288F5T5F086818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 72291cee075d - main - stand: i386: take into account disk sector size for blk calculation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72291cee075d9ef1a608b2a67762b44e024cc0d4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662649530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ac+orR1zIBOr439MRPh1gh5S9Fhk2W4TRwXevn+zovA=; b=X/fRAjFc8jtsZtpEYkg1nyF00ejVm+dgAorDVE32SWJs9begn5K0X3fanB0RYwkyoYF4Si /CbP40ckOv4gQ6KOGeUl7LboBROu4y1fFM0wuVdtLjPfD1nANw/MrtJ5154RbA7TFg3iUf BlgNu0eG3fxYq5/F+ylxqYo1wf5vZQba+oKF/MfzpibHyU3kWXggwuBVC4qRAsXgP+TUKr A7u3TesIViFrik2mp4D5pNtFaPC3+pHfPaICqFsI70DMZA9znLM1sXS9n3cOOjaeBQtKh5 iNQ1WysvrxZ4VPIdQYdpnCArUmiusXWchLZSm+DVVDP7Cr3hlWpf757NSHo9UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662649530; a=rsa-sha256; cv=none; b=fBejgsGLCMuI5sVRA4XO8y6oBK9ZKyMSZY1S9zeSKw2i8h/lRdxYlHc77fDnZNV+CrTEpD YFOtefE8O63VL9ZP8cEa3pFTYJMqVy+U+Qwl++p9uM964Ei62I1fikOwbpC1CdR4CIPZTz 6HPizvkmD0nW7K8M6XKfl6+VBTQ9FmCKeRklvfB94BiUpcH1EBYYrMZU+kAAFT+YfmdjPN WjSzG8dxDm92p6NdwZqYw6e0hUYqL5WEYSY26K7DmO/269vEG6x8FrsTvsaiKYkXuYefTW /uCf4Yo/jum8JG9s6kabplOpubiEBpe2bCZKHbFPxPm8wreJIWhYqUZkMKZaiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=72291cee075d9ef1a608b2a67762b44e024cc0d4 commit 72291cee075d9ef1a608b2a67762b44e024cc0d4 Author: Kyle Evans AuthorDate: 2022-09-08 00:35:06 +0000 Commit: Kyle Evans 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)