From nobody Sat Jan 27 09:12:15 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 4TMTNJ1JNcz5838y; Sat, 27 Jan 2024 09:12:16 +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 4TMTNH6SXwz4TX4; Sat, 27 Jan 2024 09:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346735; 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=LA7vX8431wamRBdO54lUROOKWcJHz4aI3FX/gpGhC9E=; b=KWPYogXTWC/TzaSTH9zu9BVE8tZQOSgeSYVlabB7SerWJtxVX2RTnsLyNLWCMypdTgjIiT dIUMwFTGcX+jWb9ihegZp4imUjTDdZ6y7UkzeJHCcajt82Jj3ogB98BuRx2/rxUE1xmFC2 PYxACJ8mGNqSqk47Rn4dpkV32iumB74tqW+fcwkC4J7O/bPIEIT6KiexrrADIK2S7W/PCA T+K11UjO2nHbdgg9Evyc0sCLrycRl9ednxlfBbzik+0+G03crcKJkVdF28D0yO1bZL/Cm7 sDJdjwWWarNVejoPW5RjMrwLKJ1bQYKTVUyoGtmL1hgOcNCRDVbhOLp8Gg0WDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346735; 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=LA7vX8431wamRBdO54lUROOKWcJHz4aI3FX/gpGhC9E=; b=XXlsE3x46xL5N4IKCKWu4dNlB6ab1TS9bmwDBchfJwwcy8Nu2gju055uXWD84Kd3Uvj15C iOo07X4d1kL60yYVgfetqSCeMy8ME0CASNl18AZuzwY8cAf15uGM9dZY+ME5HdycQKBJPX SSQ+plKiUq3ETFxiq/vQrYP71wo9ImIxTMzN77fB9H4SgAbxSXxCIDFOPHFmietGVT0g1Q os5s/ebcAS2wA0gENkRqyOZyGrgE6yC241wr+gndbGI4sLVf9fA4sKhUXJPGcHjGqgb/Rh I22vtrT2rtKGqICesOMUqISi+1qiCQuknZLOfdQBT39ViqrEnToTVahs0kizdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706346735; a=rsa-sha256; cv=none; b=oCvTDMH7VqqDOR159epyEVZiK3muk9UfBxGrNmQTS5En02LtNuJ8FcUiWLoF4FIF6zF2/s Kej7rkZrPDuBfcC4gukOhICdHoiWnMD5pRVE6Mle11MXvTAnv1LFoFAF6+lOblrZh8/bsU GMhHmJvZJDY/DQDzlZHvaPBfzzTjyI/VMxCJemiZq8txVwYcmQ1Tibx2PkhGqO87NG1Xwb e5IF9tZwzxNyY8/7DpqVKFXUd93LmqogfnH6ooxZzK1/wUsdWKgWn5ttFziuY9O9pJLy3y 2tzhQBlD0dsc4NkVpJFTA3JTcx0P0a6nKq7YoLwu3HQXDygJr/AWZHqcPi+/Ag== 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 4TMTNH5ZF6zJqB; Sat, 27 Jan 2024 09:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40R9CFQc012397; Sat, 27 Jan 2024 09:12:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40R9CFYf012394; Sat, 27 Jan 2024 09:12:15 GMT (envelope-from git) Date: Sat, 27 Jan 2024 09:12:15 GMT Message-Id: <202401270912.40R9CFYf012394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 63a7e799b32c - stable/14 - fsck_msdosfs: do not call checksize() if the cluster is bad 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 63a7e799b32cd9a5dcc3158677330edf8ea313bb Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=63a7e799b32cd9a5dcc3158677330edf8ea313bb commit 63a7e799b32cd9a5dcc3158677330edf8ea313bb Author: John F. Carr AuthorDate: 2024-01-20 23:18:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-27 09:11:31 +0000 fsck_msdosfs: do not call checksize() if the cluster is bad PR: 276464 (cherry picked from commit deeb1d34024b3f843d965cdf204c745165c9bac0) --- sbin/fsck_msdosfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index c60eaab59b12..19516d882e2a 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -995,7 +995,7 @@ readDosDirSection(struct fat_descriptor *fat, struct dosDirEntry *dir) n->next = pendingDirectories; n->dir = d; pendingDirectories = n; - } else { + } else if (!(mod & FSERROR)) { mod |= k = checksize(fat, p, &dirent); if (k & FSDIRMOD) mod |= THISMOD;