From nobody Tue Feb 10 10:04:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+99450+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+99450+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1675333303; cv=none; d=zohomail.com; s=zohoarc; b=eGj4CEFQQTWbPdk/yc14CeoEd0xqD+Wowx1M7Hz/CmA7JC5GaY/mjQxcQ+Tehtu/KqYWLmbHAzV0Rnp8NKEYfZEIuQIEhhwCK5N26geZy91YEYkSbK4RPYxJ8Zw39Y4iTFlpr8rRYLnc6ldKpq9MxQYZi1sx+Uh6+ZBlvLBgi/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675333303; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=NmN4vyYUMrx2ftWm4ioZiT6TR8hpNnRDqdYki8VZ2Bw=; b=Uq7Vu5Qd/9b2wrHxIU44AdIksL6huASjZRAcoqHshFv9pbAQr206lrmqEdN/w2tXKjE1peeuXq9x277LauT7cNsvK9K2qyDo5UZAO/o55FxO3XKVxF7Uaw1YvjCvK4dPB3koFxqcCe63IwnLdazLWJLQyz/V4v7d6BgGbvKq+7g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+99450+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1675333303927707.0384973309192; Thu, 2 Feb 2023 02:21:43 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id KpdyYY1788612xuQSmKWZZSx; Thu, 02 Feb 2023 02:21:43 -0800 X-Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web10.11489.1675333302793373515 for ; Thu, 02 Feb 2023 02:21:43 -0800 X-Received: by mail-ej1-f54.google.com with SMTP id lu11so4593922ejb.3 for ; Thu, 02 Feb 2023 02:21:42 -0800 (PST) X-Gm-Message-State: 7NBBd8vyGaWhRt4EU58aThTyx1787277AA= X-Google-Smtp-Source: AK7set9Fjhy+2D2mNmqv7fqJCNLYEPfB7WoY06djLMbtdFEu42KFcFBxaWj6sKtj6gymj5/C7ZQUgA== X-Received: by 2002:a17:906:16c2:b0:888:33a:e359 with SMTP id t2-20020a17090616c200b00888033ae359mr5617887ejd.38.1675333301212; Thu, 02 Feb 2023 02:21:41 -0800 (PST) X-Received: from localhost.localdomain ([176.62.67.29]) by smtp.gmail.com with ESMTPSA id ci22-20020a170906c35600b0087bcda2b07bsm10013121ejb.202.2023.02.02.02.21.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Feb 2023 02:21:40 -0800 (PST) From: "Savva Mitrofanov" To: devel@edk2.groups.io Cc: =?UTF-8?q?Marvin=20H=C3=A4user?= , Pedro Falcato , Vitaly Cheptsov Subject: [edk2-devel] [edk2-platforms][PATCH v4 04/12] Ext4Pkg: Add inode number validity check Date: Thu, 2 Feb 2023 16:21:25 +0600 Message-Id: <20230202102133.51606-5-savvamtr@gmail.com> In-Reply-To: <20230202102133.51606-1-savvamtr@gmail.com> References: <20230202102133.51606-1-savvamtr@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,savvamtr@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675333303; bh=MiXssclp+LFr7JAx/B0HiscQ4XnFknBbJ8sRdolaeuQ=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=rJ+XLcHhrCvYVfdRts/t/Hpf8hbINAMizX8HAGbEHrWByAmsXrZWHeh68+Y2HlJDPsh mzYpHulcze1SP71eN44KUyHBbF6iBaciBdBFqUwDX6yTJHd4zRdg6IGeu9KcnYxOuqOtI RwTsqxyieswMh2sUMjst9irbSaMUkwF8W/c= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675333305259100018 Content-Type: text/plain; charset="utf-8" We need to validate inode number to prevent reading non-existent and incorrect inodes so we checks that inode number valid across opened partition before we read it in Ext4ReadInode. Cc: Marvin H=C3=A4user Cc: Pedro Falcato Cc: Vitaly Cheptsov Fixes: d9ceedca6c8f ("Ext4Pkg: Add Ext4Dxe driver.") Signed-off-by: Savva Mitrofanov Acked-by: Marvin H=C3=A4user --- Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h | 13 +++++++++++-- Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h | 12 ++++++++++++ Features/Ext4Pkg/Ext4Dxe/BlockGroup.c | 5 +++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h b/Features/Ext4Pkg/Ext4Dxe= /Ext4Disk.h index d0a455d0e572..70cb6c3209dd 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h +++ b/Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h @@ -484,8 +484,17 @@ typedef UINT64 EXT4_BLOCK_NR; typedef UINT32 EXT2_BLOCK_NR; typedef UINT32 EXT4_INO_NR; =20 -// 2 is always the root inode number in ext4 -#define EXT4_ROOT_INODE_NR 2 +/* Special inode numbers */ +#define EXT4_ROOT_INODE_NR 2 +#define EXT4_USR_QUOTA_INODE_NR 3 +#define EXT4_GRP_QUOTA_INODE_NR 4 +#define EXT4_BOOT_LOADER_INODE_NR 5 +#define EXT4_UNDEL_DIR_INODE_NR 6 +#define EXT4_RESIZE_INODE_NR 7 +#define EXT4_JOURNAL_INODE_NR 8 + +/* First non-reserved inode for old ext4 filesystems */ +#define EXT4_GOOD_OLD_FIRST_INODE_NR 11 =20 #define EXT4_BLOCK_FILE_HOLE 0 =20 diff --git a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h b/Features/Ext4Pkg/Ext4Dxe/= Ext4Dxe.h index f608def7c9eb..c977a97ca5c2 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h +++ b/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h @@ -287,6 +287,18 @@ Ext4GetBlockGroupDesc ( IN UINT32 BlockGroup ); =20 +/** + Checks inode number validity across superblock of the opened partition. + Currently we don't have logic to process defective blocks with + inode number equal 1, so we don't reject them at this point + + @param[in] Partition Pointer to the opened ext4 partition. + + @return TRUE if inode number is valid. +**/ +#define EXT4_IS_VALID_INODE_NR(Partition, InodeNum) = \ + (((InodeNum) > 0) && (InodeNum) <=3D (Partition->SuperBlock.s_inodes_cou= nt)) + /** Reads an inode from disk. =20 diff --git a/Features/Ext4Pkg/Ext4Dxe/BlockGroup.c b/Features/Ext4Pkg/Ext4D= xe/BlockGroup.c index cba96cd95afc..f34cdc5dbad7 100644 --- a/Features/Ext4Pkg/Ext4Dxe/BlockGroup.c +++ b/Features/Ext4Pkg/Ext4Dxe/BlockGroup.c @@ -50,6 +50,11 @@ Ext4ReadInode ( EXT4_BLOCK_NR InodeTableStart; EFI_STATUS Status; =20 + if (!EXT4_IS_VALID_INODE_NR (Partition, InodeNum)) { + DEBUG ((DEBUG_ERROR, "[ext4] Error reading inode: inode number %lu isn= 't valid\n", InodeNum)); + return EFI_VOLUME_CORRUPTED; + } + BlockGroupNumber =3D (UINT32)DivU64x64Remainder ( InodeNum - 1, Partition->SuperBlock.s_inodes_per_group, --=20 2.39.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#99450): https://edk2.groups.io/g/devel/message/99450 Mute This Topic: https://groups.io/mt/96697369/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-