From nobody Sat Jan 27 09:13:02 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 4TMTPB3SMpz58304; Sat, 27 Jan 2024 09:13:02 +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 4TMTPB2Zyxz4V67; Sat, 27 Jan 2024 09:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346782; 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=/ntrk9UF1CJ4swPIesuCZFudTqmWnBERSsYp+lMX8XI=; b=AQMERDFLAwcawaCsgeOf9vCe6bANHtFuXZmLuio+K33c6aRe5Zouk1FV53cWTtRvcKULps Suj1ZKpGmf4Kj5eFrGVKk7biSmEotX2O10i0iMXmqSnQGjByD9ygY8P5iZDZlxJ9Nx3zEf nd8Kf2nMSKTJt3/wNxEXeXxkHDNOQXiuYB7ee7T+iSs7Fe6ExPc9FiUawF/KflCFd4p5ba S06p7ryjB8JlYY92Nx9nLHx8CqblwjkSMxonC0Fq8ZmbHfeSCYzKkbhwDUEsb+5HTw958P 4T0fGuR1ivpImlYfM/W0QBaBP0nOsurRdabeJ91eLu/jyqHRlKzZNycSFWprLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346782; 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=/ntrk9UF1CJ4swPIesuCZFudTqmWnBERSsYp+lMX8XI=; b=J1ZW6oKCWDR2Hw3/19fSfgO1EJIcWkEAAGpu1CTS9U4WGpyiUqWhrEl0clwalA2YumZqnX Gg0aXFtAcjLTLGI7fho/0cmpC6z2DCLpHu20GeboCYX5BfwggSbtE+EmRRx2O9FdzemcO2 x8siKJeKiazCCNzmTkbNdYjpneXrJ3j4/5tz8MtOLnUs6nv1MvYy6JJQedZ/NBfEph1SgA br1NztZp7yrB+vrc2ZOHxiQf7HsYVpqBM1BGQH94ky3fltuzVHng8TgRJuDXF5E/3GfOl2 6r9RiQ7vDTIpnZXyj+DIl/hkfpFq3yScX140JjmuFumgUUq52hoN4fLIsZhBLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706346782; a=rsa-sha256; cv=none; b=Wsj4VabqSJGnThx4zpAnDGf4ATA1eqX8z9VtUif1QBZb6l0tWxwCUPr+JBv9cagu9+N1i9 6R/VAHwZ1Zqmb5mt/N9KxSH2KAl6D4Djkl3isg8N8qL3tJjSF2LI7eFLktEkGJdRJjO7+Z Opl17VCoP2WtMpXtWYrbV3st7OuGLwCY6UVJVVm6DeBVvhJp+wIdM5dCFAyjL6yMwvYYLC UGHGwPZtHoT9WaTWiVq25Pm4weiDO6PuF5ZH9EYEneilRftzDV10cXJri44dImKsgBdeKE zBwxDpR/cqnHTuv9gYRS07cBf9Dvrqljf3E7vUjA2B6zDQOXFaYwtakzxIwMhg== 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 4TMTPB1f0BzJnk; Sat, 27 Jan 2024 09:13:02 +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 40R9D25Z012633; Sat, 27 Jan 2024 09:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40R9D29e012630; Sat, 27 Jan 2024 09:13:02 GMT (envelope-from git) Date: Sat, 27 Jan 2024 09:13:02 GMT Message-Id: <202401270913.40R9D29e012630@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: 3ed143596029 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 3ed143596029f4605354715c150381f2bbbc795f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3ed143596029f4605354715c150381f2bbbc795f commit 3ed143596029f4605354715c150381f2bbbc795f Author: John F. Carr AuthorDate: 2024-01-20 23:18:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-27 09:12:26 +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 be3d5ddc5425..fbd1929f17f4 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -982,7 +982,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;