From nobody Tue May 27 00:42:25 2025 X-Original-To: dev-commits-src-main@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 4b5v3j4ftXz5x5C1; Tue, 27 May 2025 00:42:25 +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 4b5v3j3Rqqz3Whp; Tue, 27 May 2025 00:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748306545; 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=oDBehHrgLKC/p9NLxxYChecYkhxbErk2/NzES56MejM=; b=Ss2tMXG46WQISxrTGi0GF1MMCjZO4WNyuHMVoHA1kB5YOKXDWKxHPj+0UlCH06MdbnqoPy YDzTLpsoXjQtNGjNxfz1Z8yhH6RHufN1r2VKbB0PY638ywm8+KCVPYwum8RWc5W+8BD31U Ipt3Ong2xqXc8Q68ds2p+L/wJ23Ncb+DVQokcxMk2fp2IvwFBX2urPsJ4oEFNtcP2ot+yu 4jV6CT6S2f1YJl7ytyDWllmsfU4jO3ggUKGxFk6l9Ms5AYBq0sTLxCD+vAAjaJtpT3hKuA qLYCmFxGe3wyLd08FSvNlUbg0jjX83gF9jQUxue2UKhV590A/8PdyBmuAXp/8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748306545; 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=oDBehHrgLKC/p9NLxxYChecYkhxbErk2/NzES56MejM=; b=MCl4/FqJWvsikrX1i47/C3SS3JMkbgyU/fgOjxdjf0EKSqVNf9ObDQNdXEU68qyX/C8kFl LPXt5wogfrG8xbdEJzgX+E3gN41LZuTgJZ2li9UHWSCY3+7WrP2bahfpI3SKuGM1tuGsdD lFq9f66d23iZQz3f2N6Rg35laiWm5KGK5oAHyUCc/3Y8JJxdvu+u+Q3Jc27fC3u5ry7w9Z mRvCINX8evTTsFSqztOrIWrtxI4Op+op9LeDNDXP0bFFpauZokLmko4Iz/lBZHCHeo7Ka0 Txbhumt59fhaNeNRFxNr+Zw4Gz3rN5BGKpA8Ygns9FY49f/KVNbxRHByah3tAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748306545; a=rsa-sha256; cv=none; b=vDMeKfZX/CFTGB1ZXxlB7i+JRUtGXKwcg5NFnsdYLvXdLlhLAQ9Z3RLMJRb7yLnC7d+Viq E5CZ0GfdkKRlV4gfHlKtAOeqabdsGRA/s3YM+yxdhPJxaLDpj42c5vR8APH80dB6HORX0q j0G3EhIbr9pH0rT+9IUGv8ZrC3DjrGmiQ54aaJBgjUjXUyF6E5wdss98MH/AFGhtUVcBqk 2S0Bdy0M8OMeUMtHbG6YPyY6FnvGCNTHNYIyixdaNxaS4qaYhrMZOAsit2MD1MD4x0SYsO tlC+gJyJMqwTMgqIgZ47TztgaN84u48AIrPc6JdjYDq9duWJAK/DUKrv/Hxhbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b5v3j2xY5zVQk; Tue, 27 May 2025 00:42: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 54R0gP3a073622; Tue, 27 May 2025 00:42:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54R0gPfr073619; Tue, 27 May 2025 00:42:25 GMT (envelope-from git) Date: Tue, 27 May 2025 00:42:25 GMT Message-Id: <202505270042.54R0gPfr073619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e36f069ecb47 - main - fsck_ffs: change struct bufarea member b_index type to uint64_t List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e36f069ecb478b9775b7ad717768d011251d479e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e36f069ecb478b9775b7ad717768d011251d479e commit e36f069ecb478b9775b7ad717768d011251d479e Author: Konstantin Belousov AuthorDate: 2025-05-25 18:11:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-27 00:42:03 +0000 fsck_ffs: change struct bufarea member b_index type to uint64_t It needs to correctly participate in the inode numbers arithmetic. It is possible to have inode number that is negative if truncated to 32 bit, which causes OOB accesses in ginode() calculating inode location in the inode block: ip->i_dp = (union dinode *) &ip->i_bp->b_un.b_dinode2[inumber - ip->i_bp->b_index]; Tested by: pho Reviewed by: mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50520 --- sbin/fsck_ffs/fsck.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 32d1d93e05c8..aaf02850f29a 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -153,7 +153,7 @@ struct bufarea { int b_flags; /* B_ flags below */ int b_type; /* BT_ type below */ int b_refcnt; /* ref count of users */ - int b_index; /* for BT_LEVEL, ptr index */ + uint64_t b_index; /* for BT_LEVEL, ptr index */ /* for BT_INODES, first inum */ union { char *b_buf; /* buffer space */