From nobody Tue May 12 19:00:51 2026 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 4gFQsj3PTpz6cw3l for ; Tue, 12 May 2026 19:00:57 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFQsh6RFPz3Pny for ; Tue, 12 May 2026 19:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778612456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8upLhb1GW/tXPKiUBgvs3DNgE5nmlLG/Y0lBoExM/s=; b=c0JzOdp3hIRdpURfDZ2BpkTJsezmuOYF3pEdGeeAMXrygVpjDqisE5AY4CNLbWGZ0xmAIK t+TRmu3Uy3jxbqszAf484oFy9cPRgOybtTE1d/KfXPQ+CEMCXW8u4fkkC5Wh/rBjlYmSaC n8NSGCfnh7tfm2cSiNvH4FShRsfauoKEAnjSELktBvtiQ0nAM8pWzcvYIdJRWqW9O00rYv vCr4It9oF5FPv/9Y0afNRa2Ja0gQvr3mFqTsLW2rrrcw/6qMtLsjF031uQ5opJ5YqSbUIi 63LflQwbbpX5sPLHNwLN5BPnOhRTeiPl8UcLcrV+haTt5muxmhPiKNOPnK7fAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778612456; a=rsa-sha256; cv=none; b=JLgK4Ot7qxjfkQO4rQzkG8Gx79pRJ1XQW0tG6NvcUXBPIw0gow4f4YbKN7kc2lOGIz8yXd 2ZeX49YZ7/bD9RndREHC27vAC3868Lz+ooaCThndX5ZimIRc7hTBF4zDcYJRYst9wht0GT gF8wsAT7KfmHYTcuYDqc+WnhzEg/IMa0NuPMVje0g0mSF8rvpj46PrftPbnPVHpFtoX84+ 6pMov8K62USoqYXMdFyKtLyYiYVmyichJRKiV0qDZMvMmx49IgTlMxppFRy9uZ1YsnQnwB ZKeF0k3g+P9GeZ7wxqngTd+BgyfdJEnkE+roFzXVoZhLsA9s1S5BrcHlox8ZsA== 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=1778612456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8upLhb1GW/tXPKiUBgvs3DNgE5nmlLG/Y0lBoExM/s=; b=HpLp+eP8EMR4wp0Pv67KO8ss81xrrzssz4Hxk2Bq9V8HuwrpIJsKLjAGTQ8pQymVVspKFj 5LtXf9KiywpW7kz0QbqARAzsx1YAafzEcRpfcgWSX4x0aiXnvilcChdvy2pfc9xGcGt7Xc 6XN5Rt3/Kd7FoeVb/z6Mb3GlVclaycHo+IUP5C2VBTi2O8S8VU1ZXrkuyOio2S+4dSYtIA g9ErDnxyKFCDSdqwwJxcthiAABaVTN63ycwgo4GYkIQbbrUUrT6m1Xo2TbT2/7fk8GmnXZ pqGPT38v010Z43q3SyrlqhrdPnVyWZluWL0ZaQ6YA85dVPnqoOXU4wUU82LIvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFQsh5pWRz1fP for ; Tue, 12 May 2026 19:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19662 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 19:00:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Lianwei Wang From: Colin Percival Subject: git: a7bc1c0c353f - releng/15.1 - fsck_msdosfs: fix FAT header correction not persisting in cache mode 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: a7bc1c0c353fc426ecfc98d42c807c74250c137d Auto-Submitted: auto-generated Date: Tue, 12 May 2026 19:00:51 +0000 Message-Id: <6a0378e3.19662.b76267f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a7bc1c0c353fc426ecfc98d42c807c74250c137d commit a7bc1c0c353fc426ecfc98d42c807c74250c137d Author: Lianwei Wang AuthorDate: 2026-05-09 04:56:12 +0000 Commit: Colin Percival CommitDate: 2026-05-12 19:00:33 +0000 fsck_msdosfs: fix FAT header correction not persisting in cache mode When fsck_msdosfs runs with FAT32 cache mode (used for large filesystems that cannot be mmap'd), a detected FAT header correction was written into the in-memory buffer but the corresponding cache entry (fat32_cache_allentries[0]) was never marked dirty. As a result, fat_flush_fat32_cache_entry() skipped it, the corrected bytes were never written to disk, and copyfat() propagated the uncorrected on-disk data to all backup FAT copies. Every subsequent fsck run would repeat the same "FAT starts with odd byte sequence / FIXED" cycle indefinitely. Fix by marking fat32_cache_allentries[0].dirty = true after applying the in-memory correction, ensuring the chunk is flushed before copyfat() runs. Approved by: re (cperciva) Obtained from: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/4047981 (cherry picked from commit 10e342c1ec78af5a0b97739c806b16a632118fa5) (cherry picked from commit ae32d61a2e3e47bed54d861893d8e2da90fb7c76) --- sbin/fsck_msdosfs/fat.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index 567bfcd428cb..5ead0b1bf783 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -927,6 +927,17 @@ readfat(int fs, struct bootblock *boot, struct fat_descriptor **fp) default: break; } + /* + * In cache mode the header lives in + * fat32_cache_allentries[0]. Mark it + * dirty so it is flushed to disk (either + * on eviction or in writefat()) before + * copyfat() copies the primary FAT to + * backup copies. + */ + if (fat->use_cache) + fat->fat32_cache_allentries[0].dirty = + true; } } }