From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by mx.groups.io with SMTP id smtpd.web10.5488.1670602280157708131 for ; Fri, 09 Dec 2022 08:11:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NCPQF00v; spf=pass (domain: gmail.com, ip: 209.85.167.46, mailfrom: savvamtr@gmail.com) Received: by mail-lf1-f46.google.com with SMTP id bp15so7723075lfb.13 for ; Fri, 09 Dec 2022 08:11:19 -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=sNbzewKXPJaBXMftpVZMWMVJIjZtAdLT8/v78DBG8dE=; b=NCPQF00vEGaGi0S5MtZXiyenpICL0oVCJStsS/on8HB4KgWD/wsccIfecyqhxtZWvp hItrrCkIqusTYWkGKFxQLpJNj7eLIvkIxbCw/pTVJ1CjXglLYOhJQBWEl9i1iTOb21qx h6e3a+poHhVsNA9f09401DOLo5p5hVwckRAwwYk03U10qEOdAmxqiWPej7gDZxjlC1jT vdUOlpYPg3xV6Q3p9mK/Uxiju9Yc0T0Efp/Wf82wwM/xX1/xtW8IaQjVkxd/bjQvZzfh 5H9UFfFzOkRSoNJdv6+yoFRtMfvQFS3pz05kCn3X/fe5xIQi/8DDfSJ+h+/pz5LiHGHU 42jA== 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=sNbzewKXPJaBXMftpVZMWMVJIjZtAdLT8/v78DBG8dE=; b=PL5w9LPeiCFsahMaW7Cuwmc73UXZhuBQRfyAoyMclVGLO0VJdGedrlmb+Vfhtel6C8 gj5HR/PHsTTJ3OL8vR80leIzbI02RSTPQGHCjwVaI4U39DjbWlxYSXd3dcvt9S4IO9iK Q9lznhN0vH4bGBye1KgwjvkMbaNZWNC1LYJ45kKEz5+pC9bWxEilgjoyCfCPBgM3SMqv 90mr9hKCzkPFfoc6Nz67gh76qZZgmVkqCDKxr4cyfVk63UbjaSWHXT/H/5UrhqTukiGj xr7RcLKmZLMLy7gIJC6OPnK2Sh7j5jjyYDAQZEAvo5moBlUpNHdQuLXdU/TVcl1sA79j m9Jg== X-Gm-Message-State: ANoB5pllDTQ0IMpGB+FcH0QTrmlHhV2ySzcUB1DF+MQE9RTLUYuThxJc 7OtaTXVh+p0CdO46HFdRjRg8vvgtIi1zudTW X-Google-Smtp-Source: AA0mqf7dSKHV5Pb8iOLtqUzEYwx1IWvNT14hUwPknnJfg7dPS7/qLD9GF/Wts3qLZoOCsf8GOgp4ow== X-Received: by 2002:ac2:58c6:0:b0:4b5:6ae8:11e5 with SMTP id u6-20020ac258c6000000b004b56ae811e5mr1778275lfo.62.1670602278117; Fri, 09 Dec 2022 08:11:18 -0800 (PST) Return-Path: Received: from localhost.localdomain ([109.194.121.139]) by smtp.gmail.com with ESMTPSA id v5-20020a05651203a500b00492c663bba2sm318430lfp.124.2022.12.09.08.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Dec 2022 08:11:17 -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 v1 04/12] Ext4Pkg: Fix incorrect checksum metadata feature check Date: Fri, 9 Dec 2022 22:10:56 +0600 Message-Id: <20221209161104.70220-5-savvamtr@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221209161104.70220-1-savvamtr@gmail.com> References: <20221209161104.70220-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 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