From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by mx.groups.io with SMTP id smtpd.web10.98479.1674811792817229856 for ; Fri, 27 Jan 2023 01:29:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qvbzNoCy; spf=pass (domain: gmail.com, ip: 209.85.167.42, mailfrom: savvamtr@gmail.com) Received: by mail-lf1-f42.google.com with SMTP id bp15so7179084lfb.13 for ; Fri, 27 Jan 2023 01:29:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iudPNrOX3D/cui1vGkmFqn9Dt3UuvE+bGK9lLFJPJas=; b=qvbzNoCyEzkinTH4Rp5a/11S4HzkEXXuCleW9shdgz/cLTGD/Dkt1uQKxK0qy73K9a wJItV4aNJkaWmz84pzHbatY8e3HI21leiU9YZe32tYKDtzFD/ZopoNlPEjtn+uk9N87b 94vK1fNUJTNRA4swiryXpATkmsUU3e+5qZl+Tn4SPXvZMfn6UDfoF00HB1lOpbE8LBRx DJDzULFUDfT8v60y+9i8edPXkGy10PU0+jXNzcjI2G5uv+DOJzTmQA0bt5gz6x1Q/sub VLArkfMpEHMOnJ4p4JGTGXOI2r0Ehe2F49a2RWdNdWvA+LOjn9ai9mo1ft5s3s6AHaKZ JxEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iudPNrOX3D/cui1vGkmFqn9Dt3UuvE+bGK9lLFJPJas=; b=Vs1YApMCHOuBBeQvBOG0uqB70v5XPfhpfiq9vUABngxBA9oZhKKWZIxuJ9YZgnrYQX bjoyE92oiquQ2F+ySJi/3maqFRB2XO5qOkciD0coj0hWV4OntQKtmf5c4IN8POhvjWFZ 4wlzwJqAwK0BQLO4zCLfSuycd+mtvyGvKZk0BOmIGdMu+9bWxd7quETDFNlZDEbJ7nbs bjy992YQ140XRVdcuTm6Md+Pad/WGkKPq4V+r5qTX8TxlobW0AqRGTy6Urg1teX4fhgH iaoyW8WgFcPRJR849igwTtR9oWO4O9n6LGjr56GdvHbWj8txFGEcfgEwdOvceNCXv+eH Zz+w== X-Gm-Message-State: AFqh2kq52DdDCX/lkpubCnmHVSRiwtHWIwgq0/5J8/M8d3tZxcI7wdXr Nwk6KzN1D7ZFCmZ1FgNaHlhAUnGcTN29u5+g X-Google-Smtp-Source: AMrXdXv0zh9uag0Jo+eqt2mwBHd75REQxVVfv7GvuxU9hRh9fvnDANPUwqaskegir3sW3rRP1JvM+g== X-Received: by 2002:ac2:4146:0:b0:4cc:553f:5b68 with SMTP id c6-20020ac24146000000b004cc553f5b68mr8036038lfi.40.1674811791014; Fri, 27 Jan 2023 01:29:51 -0800 (PST) Return-Path: Received: from localhost.localdomain ([176.62.67.29]) by smtp.gmail.com with ESMTPSA id t11-20020a056512068b00b004cc8196a308sm229071lfe.98.2023.01.27.01.29.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 27 Jan 2023 01:29:50 -0800 (PST) From: "Savva Mitrofanov" To: devel@edk2.groups.io Cc: =?UTF-8?q?Marvin=20H=C3=A4user?= , Pedro Falcato , Vitaly Cheptsov Subject: [edk2-platforms][PATCH v3 04/11] Ext4Pkg: Add inode number validity check Date: Fri, 27 Jan 2023 15:29:38 +0600 Message-Id: <20230127092945.94389-5-savvamtr@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230127092945.94389-1-savvamtr@gmail.com> References: <20230127092945.94389-1-savvamtr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable We need to validate inode number to prevent possible null-pointer dereference of directory parent in Ext4OpenDirent. Also 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 --- Features/Ext4Pkg/Ext4Dxe/Ext4Disk.h | 13 ++++++++-- Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h | 25 ++++++++++++++++++++ Features/Ext4Pkg/Ext4Dxe/BlockGroup.c | 5 ++++ Features/Ext4Pkg/Ext4Dxe/Directory.c | 10 ++++++++ 4 files changed, 51 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;=0D typedef UINT32 EXT4_INO_NR;=0D =0D -// 2 is always the root inode number in ext4=0D -#define EXT4_ROOT_INODE_NR 2=0D +/* Special inode numbers */=0D +#define EXT4_ROOT_INODE_NR 2=0D +#define EXT4_USR_QUOTA_INODE_NR 3=0D +#define EXT4_GRP_QUOTA_INODE_NR 4=0D +#define EXT4_BOOT_LOADER_INODE_NR 5=0D +#define EXT4_UNDEL_DIR_INODE_NR 6=0D +#define EXT4_RESIZE_INODE_NR 7=0D +#define EXT4_JOURNAL_INODE_NR 8=0D +=0D +/* First non-reserved inode for old ext4 filesystems */=0D +#define EXT4_GOOD_OLD_FIRST_INODE_NR 11=0D =0D #define EXT4_BLOCK_FILE_HOLE 0=0D =0D diff --git a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h b/Features/Ext4Pkg/Ext4Dxe/= Ext4Dxe.h index f608def7c9eb..2e489ce4dd86 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h +++ b/Features/Ext4Pkg/Ext4Dxe/Ext4Dxe.h @@ -287,6 +287,31 @@ Ext4GetBlockGroupDesc ( IN UINT32 BlockGroup=0D );=0D =0D +/**=0D + Retrieves the first usable non-reserved inode number from the superbloc= k=0D + of the opened partition.=0D +=0D + @param[in] Partition Pointer to the opened ext4 partition.=0D +=0D + @return The first usable inode number (non-reserved).=0D +**/=0D +#define EXT4_FIRST_INODE_NR(Partition) = \=0D + ((Partition->SuperBlock.s_rev_level =3D=3D EXT4_GOOD_OLD_REV) ? = \=0D + EXT4_GOOD_OLD_FIRST_INODE_NR : = \=0D + Partition->SuperBlock.s_first_ino)=0D +=0D +/**=0D + Checks inode number validity across superblock of the opened partition.= =0D +=0D + @param[in] Partition Pointer to the opened ext4 partition.=0D +=0D + @return TRUE if inode number is valid.=0D +**/=0D +#define EXT4_IS_VALID_INODE_NR(Partition, InodeNum) = \=0D + (InodeNum =3D=3D EXT4_ROOT_INODE_NR || = \=0D + (InodeNum >=3D EXT4_FIRST_INODE_NR(Partition) && = \=0D + InodeNum <=3D Partition->SuperBlock.s_inodes_count))=0D +=0D /**=0D Reads an inode from disk.=0D =0D 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;=0D EFI_STATUS Status;=0D =0D + if (!EXT4_IS_VALID_INODE_NR (Partition, InodeNum)) {=0D + DEBUG ((DEBUG_ERROR, "[ext4] Error reading inode: inode number %lu isn= 't valid\n", InodeNum));=0D + return EFI_VOLUME_CORRUPTED;=0D + }=0D +=0D BlockGroupNumber =3D (UINT32)DivU64x64Remainder (=0D InodeNum - 1,=0D Partition->SuperBlock.s_inodes_per_group,=0D diff --git a/Features/Ext4Pkg/Ext4Dxe/Directory.c b/Features/Ext4Pkg/Ext4Dx= e/Directory.c index f80b1aacd459..2e9a58a7e329 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Directory.c +++ b/Features/Ext4Pkg/Ext4Dxe/Directory.c @@ -164,6 +164,10 @@ Ext4RetrieveDirent ( if (Entry->inode =3D=3D 0) {=0D BlockOffset +=3D Entry->rec_len;=0D continue;=0D + } else if (!EXT4_IS_VALID_INODE_NR (Partition, Entry->inode)) {=0D + DEBUG ((DEBUG_ERROR, "[ext4] Ext4RetrieveDirent directory entry in= ode number %u isn't valid\n", Entry->inode));=0D + Status =3D EFI_VOLUME_CORRUPTED;=0D + goto Out;=0D }=0D =0D Status =3D Ext4GetUcs2DirentName (Entry, DirentUcs2Name);=0D @@ -510,6 +514,12 @@ Ext4ReadDir ( // (which we should not expose to ReadDir).=0D ShouldSkip =3D Entry.inode =3D=3D 0 || Entry.name_len =3D=3D 0 || IsDo= tOrDotDot;=0D =0D + if ((Entry.inode !=3D 0) && !EXT4_IS_VALID_INODE_NR (Partition, Entry.= inode)) {=0D + DEBUG ((DEBUG_ERROR, "[ext4] Ext4ReadDir directory entry inode numbe= r %u isn't valid\n", Entry.inode));=0D + Status =3D EFI_VOLUME_CORRUPTED;=0D + goto Out;=0D + }=0D +=0D if (ShouldSkip) {=0D Offset +=3D Entry.rec_len;=0D continue;=0D --=20 2.39.0