From nobody Thu Sep 10 02:32:14 2026 X-Original-To: dev-commits-src-branches@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 4hgMC33xm0z6rsFg for ; Thu, 10 Sep 2026 02:32:15 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hgMC31Lr6z3L1P for ; Thu, 10 Sep 2026 02:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007535; 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=MDl5VkzWXu0x0+q0K3iNX8cHO7GM7z9TnuDOp1eix+A=; b=tVgyHQAHCJIYEAOSD/fRYeEakYcXOyHeaDE/k8sMX6SiAyXh3FA95o7PnlF/b0jhTohMNq BhTnYqFw48VnNfjwi6sfHrhDZcvVC+XEzJJyt9NG7GxxfMQHSglxJ+jlXo+YB3WGVLMIO4 QZ685E4jjOir4P7U3qvhA4HlM5qoZPuyBflrStjcEwtgxOGIUZKGdlSDVLrlhsdzWcjPB6 f5KGKi3TL7Rhy/V1XWcogzTYJazf2/4YLIYPahy3UWrNyX5a77oI1JrW7rCmvpUeKKl1Qf 5ECZaZ/XjorzXGzzHlbU+L53WGJa7VGOSkyTkIxqAqaduOrWHyQZA0e750OJsg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789007535; b=DOhm9WSQjf5Esvvsqx8Bq8q2taFawQ5u0z0oR2NKcuc5jMEQegrYbPou1O7yrliC3Anqz7 ocvSR3cNEQA0p/rx9ZCIefidcf6G5Mg//BAOObNR6ch07lzmEZj8kTqJP8/UOuc3zR25+c kYRnYC9TPwyzZ6/cxG2ITBmkWrqFNC9hyYKiZ/n58Pvjlbu2JNTVUIFvdl4IpQq3MTgMoZ y4a2zLaqcj51SCIHc2mfm8jSDNbFV6DWF3LR6R+/vq5J4WvQ3SQNXEc0aPjv3bKgEDNXbN fnry6wErrQ7hdqVigUhxtD6OeK/q9TW+EMGpv05WqakCw8bqAiAYM4sFuKB1Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007535; 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=MDl5VkzWXu0x0+q0K3iNX8cHO7GM7z9TnuDOp1eix+A=; b=lUyFcEDB71fmJJ8Al8alx9e+WtLn4eS5v6Q5qtNVQOvwcApolB1j47X2en4dt7vCHbnXkn fmBNN+qXdldqL5H23k9d6Ap3vhqKYbAuNVVXZOgW5lZHD54gG8u0bepawqzMqSxk1+WtIW a/o4I5A9VZUtYNOG1XkP6RzvN+7GWSHXASqSVzI5g3Q7Nibjhp7zwqfLDAGV8z4opoi05P Evf7lXxsaqsofyqzhiG4E73Lp4Nvh+Djdmb/SnNzLd+8z7JRZZHYZzUDAZUfqUFyICxaCM RVlKCno/vmjXmTLZdSszbZxNaqvihKtQoXXDwWAsUlLlACJsDkM5xhZroYYqZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hgMC304jQz1Mjd for ; Thu, 10 Sep 2026 02:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2062e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 02:32:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Chris Suter From: Xin LI Subject: git: 981bb14f5de8 - stable/14 - MFC: fsck_msdosfs: avoid signed integer overflow in readboot() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 981bb14f5de86c9f911a51de5e8d0110173aa24c Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 02:32:14 +0000 Message-Id: <6aa216ae.2062e.1e23bfa5@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=981bb14f5de86c9f911a51de5e8d0110173aa24c commit 981bb14f5de86c9f911a51de5e8d0110173aa24c Author: Chris Suter AuthorDate: 2026-09-03 05:23:46 +0000 Commit: Xin LI CommitDate: 2026-09-10 02:31:08 +0000 MFC: fsck_msdosfs: avoid signed integer overflow in readboot() (cherry picked from commit 18094609d301540526d3d57e92705bc989d29986) --- sbin/fsck_msdosfs/boot.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c index f91609470ad7..ec59c3e02dde 100644 --- a/sbin/fsck_msdosfs/boot.c +++ b/sbin/fsck_msdosfs/boot.c @@ -32,6 +32,7 @@ __RCSID("$NetBSD: boot.c,v 1.22 2020/01/11 16:29:07 christos Exp $"); #endif /* not lint */ #include +#include #include #include @@ -127,12 +128,10 @@ readboot(int dosfs, struct bootblock *boot) boot->bpbHeads = block[26] + (block[27] << 8); /* Hidden sectors: ignored */ - boot->bpbHiddenSecs = block[28] + (block[29] << 8) + - (block[30] << 16) + (block[31] << 24); + boot->bpbHiddenSecs = le32dec(&block[28]); /* Total sectors (32 bits) */ - boot->bpbHugeSectors = block[32] + (block[33] << 8) + - (block[34] << 16) + (block[35] << 24); + boot->bpbHugeSectors = le32dec(&block[32]); if (boot->bpbHugeSectors == 0) { if (boot->flags & FAT32) { pfatal("FAT32 with sector count of zero"); @@ -158,8 +157,7 @@ readboot(int dosfs, struct bootblock *boot) } /* 32-bit count of sectors per FAT */ - boot->FATsecs = block[36] + (block[37] << 8) - + (block[38] << 16) + (block[39] << 24); + boot->FATsecs = le32dec(&block[36]); if (block[40] & 0x80) boot->ValidFat = block[40] & 0x0f; @@ -176,8 +174,7 @@ readboot(int dosfs, struct bootblock *boot) * * Should be 2 but do not require it. */ - boot->bpbRootClust = block[44] + (block[45] << 8) - + (block[46] << 16) + (block[47] << 24); + boot->bpbRootClust = le32dec(&block[44]); /* Sector number of the FSInfo structure, usually 1 */ boot->bpbFSInfo = block[48] + (block[49] << 8); @@ -236,12 +233,8 @@ readboot(int dosfs, struct bootblock *boot) boot->bpbFSInfo = 0; } else { /* We appear to have a valid FSInfo block, decode */ - boot->FSFree = fsinfo[0x1e8] + (fsinfo[0x1e9] << 8) - + (fsinfo[0x1ea] << 16) - + (fsinfo[0x1eb] << 24); - boot->FSNext = fsinfo[0x1ec] + (fsinfo[0x1ed] << 8) - + (fsinfo[0x1ee] << 16) - + (fsinfo[0x1ef] << 24); + boot->FSFree = le32dec(&fsinfo[0x1e8]); + boot->FSNext = le32dec(&fsinfo[0x1ec]); } } else { /* !FAT32: FAT12/FAT16 */