From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by mx.groups.io with SMTP id smtpd.web11.45003.1670856424392905373 for ; Mon, 12 Dec 2022 06:47:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=BjuQaGvD; spf=pass (domain: gmail.com, ip: 209.85.167.53, mailfrom: savvamtr@gmail.com) Received: by mail-lf1-f53.google.com with SMTP id p36so18957147lfa.12 for ; Mon, 12 Dec 2022 06:47:04 -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=8KrsFWmxDC3wti+jlcbo0wL+zzN4I72lqpvJXo3K31I=; b=BjuQaGvDVsjEwk3PTjcH8rpdixD0WCZ5ZsE3klko3f9wmx1Kk2xp1EdPAQexDkfn5i IPJ/7fK8ltT3R/eLO+A5RlXuH9XSynqu/lI2sp99nm8Tqj+mjhYJpACE+1+zGFdxMw4C sFyROjY2obC8Kt5I/QCoztFi8JSnKEgaPlYMMjIJWK2U3wzBttY/Ld85hoAzZdLC0vt5 A4gXeUfKbTnwz0pZacz+ZqbgMYHOC6xIEvy3T48IOtu0KYFb7J4ItBNENx+VZN41c1P5 aYpG7OhEtntXm7t67yJ86NDu8H5Hl6AvOF5hiPzYq2qUldDMRfCJFvzayd5wKLm3EC2p UVgA== 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=8KrsFWmxDC3wti+jlcbo0wL+zzN4I72lqpvJXo3K31I=; b=abAvbGbGs9HOx88d11qc3KzLOErNV0hzgsFbLKs4KUuVrK/sWtdC0QjvL0Hb4t0K4/ R+OKwt18JhAshr/nkoACJiDGYB68JKuiE80kmt5fG+fQXfzFKlQI0Jx0IP2CCFnaZdNW +vMdABOzgHYbUsCS15akPt/tQYrdW1IuPKFWD5hmZp55vRHRHg4zJubPh7SJCpTWBVpb c4i2R3OdNMmWTtZvetakwsIen4VZ3M5kkeKbHE89bFoHwNZiK3KEsrot9ZiTr7RjSiYZ NnCG4jruxa9KZuEDia0pWMfBvLAE9J9avFuzj4kQJHT0U3edrrhE6zxmBQhdE31szbeI bHzw== X-Gm-Message-State: ANoB5ple7E5NJ7///vO/YL1FUwKMNPywVFTEjgv+Ng8xox9lw9drBo7O lhbIr2KxLiTip+hu0jQx5WlVmnJJZUGw8ojA X-Google-Smtp-Source: AA0mqf686Hrf73c3jlN3JqhgPAtFMArUDGB82CpETGG1ns1zSH6DwAnn3KxmeWkVhMG7oypKqYzizA== X-Received: by 2002:a05:6512:c09:b0:4b6:e64c:aec6 with SMTP id z9-20020a0565120c0900b004b6e64caec6mr2368209lfu.63.1670856422590; Mon, 12 Dec 2022 06:47:02 -0800 (PST) Return-Path: Received: from localhost.localdomain ([77.221.215.144]) by smtp.gmail.com with ESMTPSA id t4-20020a056512030400b0049c29292250sm1643313lfp.149.2022.12.12.06.47.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 06:47:02 -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 v2 04/11] Ext4Pkg: Fix incorrect checksum metadata feature check Date: Mon, 12 Dec 2022 20:46:47 +0600 Message-Id: <20221212144654.2650-5-savvamtr@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212144654.2650-1-savvamtr@gmail.com> References: <20221212144654.2650-1-savvamtr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Missing comparison !=3D 0 leads to broken logic condition. Also replaced CSUM_SEED feature_incompat check with predefined macro EXT4_HAS_INCOMPAT Cc: Marvin H=C3=A4user Cc: Pedro Falcato Cc: Vitaly Cheptsov Fixes: e55f0527dde48a5f139c1b8f35acc4e6b59dd794 Signed-off-by: Savva Mitrofanov --- Features/Ext4Pkg/Ext4Dxe/Superblock.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/Superblock.c b/Features/Ext4Pkg/Ext4D= xe/Superblock.c index edee051c41e8..4c662bd1784f 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Superblock.c +++ b/Features/Ext4Pkg/Ext4Dxe/Superblock.c @@ -220,13 +220,11 @@ Ext4OpenSuperblock ( }=0D =0D // At the time of writing, it's the only supported checksum.=0D - if (Partition->FeaturesCompat & EXT4_FEATURE_RO_COMPAT_METADATA_CSUM &&= =0D - (Sb->s_checksum_type !=3D EXT4_CHECKSUM_CRC32C))=0D - {=0D + if (EXT4_HAS_METADATA_CSUM (Partition) && (Sb->s_checksum_type !=3D EXT4= _CHECKSUM_CRC32C)) {=0D return EFI_UNSUPPORTED;=0D }=0D =0D - if ((Partition->FeaturesIncompat & EXT4_FEATURE_INCOMPAT_CSUM_SEED) !=3D= 0) {=0D + if (EXT4_HAS_INCOMPAT (Partition, EXT4_FEATURE_INCOMPAT_CSUM_SEED)) {=0D Partition->InitialSeed =3D Sb->s_checksum_seed;=0D } else {=0D Partition->InitialSeed =3D Ext4CalculateChecksum (Partition, Sb->s_uui= d, 16, ~0U);=0D --=20 2.38.1