From nobody Thu Aug 15 19:06:25 2024 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 4WlF361K4lz5Sh7Y; Thu, 15 Aug 2024 19:06:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlF356bgrz4rDv; Thu, 15 Aug 2024 19:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723748785; 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=ApqpvPYDZ4EpaQ9IbbVZdJYinMxfJkEna2qGgRMHLuo=; b=QH8kKFis/vRMmu0rGW+hVxMH3aa4VaR+RsUGB5IQAImiB9jxjywovt6Etvw40RngdSrpCz MSiUQtkZSRVBy2nGomyqhOGR4rWNgxer+FWiix5a0INLTka7h1MEsYQpymSSVskbMQSVji omofSriqYUdu0hzBBOh1AqzHtqXEcoH0iR4DpiGACuEEl5RMEIerjlYHcBBk7bRLtVvhdP pjsy9Ie7nO2fR7IUKniyp2xFHdwEo/SDaSn+fkbfLQZ4B/yj8GyWwKTYgYydIiZR6HplX8 Tq2tKTnK4f1VMW4B+v8ZW+kkc40Go8N2bJbpS39/ujnNHr/MCH5S/gRFzYetHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723748785; a=rsa-sha256; cv=none; b=GfrvWTCyzTbBS++6L30DG8nic5+YoYRMpWGmnFDdPkJUHLTClgiHRxKWZhA+6HOH8jNjr6 q3s5UAGh4NgDsdu7PgfUeEvz0VyDx493wlSIdfx0i4v3Nekx1SiEPPm0H9clKmujAMv/yC dgAYPQ+4Dfwf9hjkOBQgiUQAJaBrxgm/vlAisTy2ddnfFc/YwqrdflH3KDh954iiiPTWUQ 3Pt4Q9L6uEXqLUg2VCxv0rvpeP55TvjSIJnWOqhEx00SOlMqMf8ZfpK5JhfB9rASywfCEV eFV9iQHikGpa6i1JEeIv2E5aou5mWRBf38dsOwYdhzo6O344AQmhjG+xiJDFng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723748785; 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=ApqpvPYDZ4EpaQ9IbbVZdJYinMxfJkEna2qGgRMHLuo=; b=pAwAlL5+a/bMePmKV7u3QXqttJDuyYdlfyRpb0qZdK6/6cytR6RID6NRumxevuW96xEalM GzZw6q6FjqG38BI5K1SxmbYJP7xsU9PXLoWvP896wo/te/UfPyndV9MY+EmnizwoSGUwtA qPYtDSMGxiSW3U7mMBzij3FpIMTHK/CtIjORRlApHntboEhB2/Uk6vy83pPYhkh7cONkS3 dLJ01LmFupnSF/2eb5PiDRqti4CigGq/oGqHcCGN/G0gmYcc1qp3WlvctpEwok43/1kB72 +6oFJEfUSmEcdmPS2Ltp5s+GwaY1JZTKl4wvlcIxSFK2Ma4yjCMNNbVRbS74cA== 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 4WlF356D22zZdY; Thu, 15 Aug 2024 19:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FJ6P1a092323; Thu, 15 Aug 2024 19:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FJ6PrG092321; Thu, 15 Aug 2024 19:06:25 GMT (envelope-from git) Date: Thu, 15 Aug 2024 19:06:25 GMT Message-Id: <202408151906.47FJ6PrG092321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 8774fa749d4e - stable/14 - msdosfs: fix cluster limit when mounting FAT-16 file systems 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8774fa749d4e6d2726c0ed662a36657782ad0cec Auto-Submitted: auto-generated The branch stable/14 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=8774fa749d4e6d2726c0ed662a36657782ad0cec commit 8774fa749d4e6d2726c0ed662a36657782ad0cec Author: Stefan Eßer AuthorDate: 2024-08-09 17:26:27 +0000 Commit: Stefan Eßer CommitDate: 2024-08-15 19:05:08 +0000 msdosfs: fix cluster limit when mounting FAT-16 file systems The maximum cluster number was calculated based on the number of data cluters that fit in the givem partition size and the size of the FAT area. This limit did not take into account that the highest 10 cluster numbers are reserved and must not be used for files. PR: 280347 Reported by: pho@FreeBSD.org (cherry picked from commit 45d4e82bf61f91792142a2b9e2af657dab8500fd) --- sys/fs/msdosfs/msdosfs_vfsops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 258c701bd300..adcffe45df82 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -722,7 +722,9 @@ mountmsdosfs(struct vnode *odevvp, struct mount *mp) } } - clusters = (pmp->pm_fatsize / pmp->pm_fatmult) * pmp->pm_fatdiv ; + clusters = (pmp->pm_fatsize / pmp->pm_fatmult) * pmp->pm_fatdiv; + if (clusters >= (CLUST_RSRVD & pmp->pm_fatmask)) + clusters = CLUST_RSRVD & pmp->pm_fatmask; if (pmp->pm_maxcluster >= clusters) { #ifdef MSDOSFS_DEBUG printf("Warning: number of clusters (%ld) exceeds FAT "