From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by mx.groups.io with SMTP id smtpd.web08.39781.1658232638355434988 for ; Tue, 19 Jul 2022 05:10:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DhqmYQxX; spf=pass (domain: gmail.com, ip: 209.85.167.43, mailfrom: savvamtr@gmail.com) Received: by mail-lf1-f43.google.com with SMTP id a9so24399094lfk.11 for ; Tue, 19 Jul 2022 05:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ygzGyyGRvzb8VGACyV1fX3rI3X8jKdd5b82Fy8T3o6A=; b=DhqmYQxXvS4oPXkmEekz9kkVTjrcnwsY7epzLn474OwUfhVqnM/JTjQASSltm8e0+h DU4IXBEWV2xTb7XjszEzUT4LnYVtsCZaE54VJcRZvREU9QbONdWSTiC3TQwfM0EGyR0J +Usei755EsrJ0+gR0XZC1vGe9pCDesI0kgey6Uld4tXY/Kuwxt7ygKumXf7se167B+ta gzH8XPsareeMos2/zCLr9vKqc/8zVonioadQVzMRfvKhIqQXEYX1mmpZKrcTMqRUIt1V 23mn58BTYoUYQLoHF4FGvXiMMH3xPblUvikY3ZnRa+3nVJCBQdcqPdvs0KC7jC8Idrg2 8ERQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ygzGyyGRvzb8VGACyV1fX3rI3X8jKdd5b82Fy8T3o6A=; b=U+MqBd7yhp7boz8jVYqiu0Tjg9jp1S8TafP6/cgK356iJQO7982lQHhD4nyiB5Uryj qkGLqmXUEi93vOpvSLc9zd9wtk9XwIJC7eb8Ak4k/JMnS0XfPfSUZja1FG3EbP2rQlLJ TSGos8+T38QFsA+3HqS8PNbbNFz3pBo9VWH7jM7tfrPcQVxa1WFX6lOvhkBLrZgvaxOg lcxZWneW7+hsTOKAkKi6IW9vrma8NEU3XS2mVHPlJCpmLaGl8ntP7+7WqTpuvBE5p0m0 KWUqFi7jCe0C+pxNCPNzlJ0nZTgupnELoWJysOY+EL/9qNg70HUQl44+ciQtKB5uoKgP 0AQQ== X-Gm-Message-State: AJIora8RljtVbc6iMcAG6DRvNxWzgjb74zeqIjkhX+aJ/0DlkbtC640k VF8MUDrXuuNs4yRh7hsvD2zlyDg8PwBSI0XON6A= X-Google-Smtp-Source: AGRyM1uXz9kIUKW+Jr9gmWDavyPH6Asasz3dOU8HBBX30ywfI8RjP5ho9FUfw6Ui569Fs+sbOl4n6A== X-Received: by 2002:a19:6b07:0:b0:489:c785:8dfc with SMTP id d7-20020a196b07000000b00489c7858dfcmr16172646lfa.268.1658232648068; Tue, 19 Jul 2022 05:10:48 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([207.180.219.167]) by smtp.gmail.com with ESMTPSA id z20-20020a2eb534000000b0025d6ecbc897sm2668245ljm.46.2022.07.19.05.10.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jul 2022 05:10:47 -0700 (PDT) From: "Savva Mitrofanov" To: devel@edk2.groups.io Cc: =?UTF-8?q?Marvin=20H=C3=A4user?= , Pedro Falcato , Vitaly Cheptsov Subject: [edk2-platforms][PATCH 10/10] Ext4Pkg: Group descriptor size must be 4-byte aligned Date: Tue, 19 Jul 2022 18:10:16 +0600 Message-Id: <20220719121016.29380-11-savvamtr@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220719121016.29380-1-savvamtr@gmail.com> References: <20220719121016.29380-1-savvamtr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Adds 4-byte aligned check for superblock group descriptor size field Cc: Marvin H=C3=A4user Cc: Pedro Falcato Cc: Vitaly Cheptsov Signed-off-by: Savva Mitrofanov --- Features/Ext4Pkg/Ext4Dxe/Directory.c | 2 +- Features/Ext4Pkg/Ext4Dxe/Superblock.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/Directory.c b/Features/Ext4Pkg/Ext4Dx= e/Directory.c index d1038c04926e..4441e6d192b6 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Directory.c +++ b/Features/Ext4Pkg/Ext4Dxe/Directory.c @@ -74,7 +74,7 @@ Ext4ValidDirent ( }=0D =0D // Dirent sizes need to be 4 byte aligned=0D - if (Dirent->rec_len % 4) {=0D + if ((Dirent->rec_len % 4) !=3D 0) {=0D return FALSE;=0D }=0D =0D diff --git a/Features/Ext4Pkg/Ext4Dxe/Superblock.c b/Features/Ext4Pkg/Ext4D= xe/Superblock.c index 42762b6aa780..3bf2e3001f26 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Superblock.c +++ b/Features/Ext4Pkg/Ext4Dxe/Superblock.c @@ -257,16 +257,16 @@ Ext4OpenSuperblock ( ));=0D =0D if (EXT4_IS_64_BIT (Partition)) {=0D + // s_desc_size should be 4 byte aligned and=0D + // 64 bit filesystems need DescSize to be 64 bytes=0D + if (((Sb->s_desc_size % 4) !=3D 0) || (Sb->s_desc_size < EXT4_64BIT_BL= OCK_DESC_SIZE)) {=0D + return EFI_VOLUME_CORRUPTED;=0D + }=0D Partition->DescSize =3D Sb->s_desc_size;=0D } else {=0D Partition->DescSize =3D EXT4_OLD_BLOCK_DESC_SIZE;=0D }=0D =0D - if ((Partition->DescSize < EXT4_64BIT_BLOCK_DESC_SIZE) && EXT4_IS_64_BIT= (Partition)) {=0D - // 64 bit filesystems need DescSize to be 64 bytes=0D - return EFI_VOLUME_CORRUPTED;=0D - }=0D -=0D if (!Ext4VerifySuperblockChecksum (Partition, Sb)) {=0D DEBUG ((DEBUG_ERROR, "[ext4] Bad superblock checksum %lx\n", Ext4Calcu= lateSuperblockChecksum (Partition, Sb)));=0D return EFI_VOLUME_CORRUPTED;=0D --=20 2.37.0