From nobody Mon Feb 14 15:07:04 2022 X-Original-To: dev-commits-src-main@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 7D5B119B4237; Mon, 14 Feb 2022 15:07:05 +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 4Jy6yK0tWRz3DLR; Mon, 14 Feb 2022 15:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644851225; 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=RSza1mLMxkreIMV/GgvgV/kLstHKQWuzy4ZJ/u+9PiQ=; b=hPM94zzJpmaFChsi3Gl33lnRXV58EslMGEJevo8uGJRc0pCpA4exwkRGe1gw+orH8/HmZN YQ3SMX4T8vyAI5W+dxAB74ar1d4fK+fURs4AivVbyhpQ8aFzJdZlP4Z/BstZXx3rulx07P YEQIXQbDsMxcsK/edKko4EE6ueJdOlIW6+v93GlurTL02CUMZX0n0BRaonjMaaXKQJ3pNe U89XVLOcfACIn1WtPoIEl9tvBnW0eCkx5HHDW0KOZzIh0/eXco8BqQJ8TyuJRkAkXyCae2 gv3WwRNpJRLhfMEKLqX7Iiui20BEIPBIkS1MadoBJbZagLWuzizbBn+Y7kfoNw== 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 D4F661118C; Mon, 14 Feb 2022 15:07:04 +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 21EF74CH060108; Mon, 14 Feb 2022 15:07:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21EF74c2060107; Mon, 14 Feb 2022 15:07:04 GMT (envelope-from git) Date: Mon, 14 Feb 2022 15:07:04 GMT Message-Id: <202202141507.21EF74c2060107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c7cd607a4e28 - main - msdosfs: Fix mounting when the device sector size is >512B List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7cd607a4e28233ab6679ee330c0a4836414bb0a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644851225; 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=RSza1mLMxkreIMV/GgvgV/kLstHKQWuzy4ZJ/u+9PiQ=; b=WHaeKJLVQrzFbq6cKPsRFFDZ18c5Uo+4RI42wJLPY8IpQH2BW+S59XRQzEzg/trJLKo5sK el0gdim1SWD1/jx/DDG0QzbhXtw+mZnY2+GZIs0vlWiHaAfckU7CrqmmvvHvMYJ3z+scff BKyGLROYcoByUIZ2VEd3I5/QfYbaPkyu5VMVIY7rsQzVGfwJ+Iqw9Jpww7fhPNW0ClIOqF rkFHgiXIOarQ9APqq6iwNAlmf607Q8nuhxxMWlgN6CRwdJwi+dBmAUHRo5nuwqNmJWm83Q QvT8PfRTr7PztaZpLynSOgsloNv6n+PCjRNQd/0EecIa6Px2rdsDZNS42RNXIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644851225; a=rsa-sha256; cv=none; b=bmyCfo2SnLSqxhSaDlYqKM+KJeWlCC23nI0vEhybO1yu3KNhC9/061UQ4sLfmEHdsQmL8K 7vsKL7YPjrTyec5uyvxyiItCEktJCJF9PN+RHEGgYgK9ilSB+425MimWGyH4frcIpY0IDa dhwv0ITk7La/7etbq12TsOb6dpjlMJvK1tkNIztFxYwJbLwIGhv1RQE/x6DGsXfCJL6Uw4 WPP3mejelKF8KyC7Dm1sbCrcwqH65aKj99k03dVpFijwJ9c0bqyLSY/rc8TFXXSBaX/rus qQXgJNo9t4L+j2Lr/G0NN8Jy1H73OAzDls2b1WbNnvyxpeP5UMfk970whuxnRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c7cd607a4e28233ab6679ee330c0a4836414bb0a commit c7cd607a4e28233ab6679ee330c0a4836414bb0a Author: Mark Johnston AuthorDate: 2022-02-14 14:41:32 +0000 Commit: Mark Johnston CommitDate: 2022-02-14 15:06:47 +0000 msdosfs: Fix mounting when the device sector size is >512B HugeSectors * BytesPerSec should be computed before converting HugeSectors to a DEV_BSIZE-based count. Fixes: ba2c98389b78 ("msdosfs: sanity check sector count from BPB") Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34264 --- sys/fs/msdosfs/msdosfs_vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 15f90c2e0e23..17c1699a584a 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -577,7 +577,6 @@ mountmsdosfs(struct vnode *odevvp, struct mount *mp) goto error_exit; } - pmp->pm_HugeSectors *= pmp->pm_BlkPerSec; if ((off_t)pmp->pm_HugeSectors * pmp->pm_BytesPerSec < pmp->pm_HugeSectors /* overflow */ || (off_t)pmp->pm_HugeSectors * pmp->pm_BytesPerSec > @@ -586,6 +585,7 @@ mountmsdosfs(struct vnode *odevvp, struct mount *mp) goto error_exit; } + pmp->pm_HugeSectors *= pmp->pm_BlkPerSec; pmp->pm_HiddenSects *= pmp->pm_BlkPerSec; /* XXX not used? */ pmp->pm_FATsecs *= pmp->pm_BlkPerSec; SecPerClust *= pmp->pm_BlkPerSec;