From nobody Mon May 6 00:06:26 2024 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+97581+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+97581+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1671496765; cv=none; d=zohomail.com; s=zohoarc; b=KPiNOgkWz0vQIV2MjFeDcaXlYJ4EcNQGVBTnX3Ob1yS5XCB63eq2j2aItFbOrn9625I+GkR4mC+lGA4+pvNYlOMqccMPmEsoh0q2wjjyUHp4hfqnwDc9kXuXtoeoIFA/D+7nLpNGGpzefWjvxMaRcuQKrWDKxO3fddivIr1FW1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671496765; h=Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=1vfmTqdRlMPaEp6X72ZI2127ca0U9mXgC6F7+mmD4Qs=; b=NEzG2MRQZ7RGXSUmVIAUmL4iRjYdr1oyOUugnM5/JE1XoUGNZMNx2QWzXBSVPildC2RusTyuh37S001ZsKGcgIodtqRMEFzGUg5FL/EtW1mRneYmeEp9HIOwfnH5LOjkM+2jQfIiJ0ZFQg3dn7naL23V95Yih8ENTv2broucXOU= 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+97581+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 1671496765362773.5248943548893; Mon, 19 Dec 2022 16:39:25 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id UGDrYY1788612xxDqudGcQQj; Mon, 19 Dec 2022 16:39:25 -0800 X-Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.135243.1671114459492955286 for ; Thu, 15 Dec 2022 06:27:39 -0800 X-Received: by mail-pj1-f48.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so2887139pjs.4 for ; Thu, 15 Dec 2022 06:27:39 -0800 (PST) X-Gm-Message-State: LBjk9vBGiVP45Hk97UTNXGjcx1787277AA= X-Google-Smtp-Source: AA0mqf78mtxbdmiVfjDyOucRkU8/u5UWumwnV9zPZ/1LWMdYt7nuQzWgghjVp+hr8gr3WKUSj0cUGA== X-Received: by 2002:a17:902:a9c2:b0:189:8b5:2fe3 with SMTP id b2-20020a170902a9c200b0018908b52fe3mr25283865plr.54.1671114458692; Thu, 15 Dec 2022 06:27:38 -0800 (PST) X-Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id f6-20020a170902684600b001887e30b9ddsm3852736pln.257.2022.12.15.06.27.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 06:27:38 -0800 (PST) From: "Lee, Chun-Yi" X-Google-Original-From: "Lee, Chun-Yi" To: devel@edk2.groups.io Cc: Min M Xu , Gerd Hoffmann , Jiewen Yao , Tom Lendacky , James Bottomley , Erdem Aktas , "Lee, Chun-Yi" Subject: [edk2-devel] [PATCH v2] OvmfPkg/PlatformInitLib: Fix integrity checking failed of NvVarStore in some cases Date: Thu, 15 Dec 2022 22:27:23 +0800 Message-Id: <20221215142723.9788-1-jlee@suse.com> 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,joeyli.kernel@gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1671496765; bh=kQ29GDrkmcrrmskmeqSlmIBXwx/dFZKXNoutS6rbQbM=; h=Cc:Date:From:Reply-To:Subject:To; b=ZkVDB9xgLS8KYcYbSqOylMRBoSWgvFF5dai59QTm7hkXUtLK4PbFQg+NvBsz2oWgKom ViM1JuH6oXP+oWK7zpdr1sBQbzFZDUoSqB3tWF8IriVSPmYDcoOf1/O8evT4xcVoOb92J D9KOM830xkCHQgOFb1Cb1QJNYkHWv02NjGc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1671496767136100005 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In the commit 4f173db8b4 "OvmfPkg/PlatformInitLib: Add functions for EmuVariableNvStore", it introduced a PlatformValidateNvVarStore() function for checking the integrity of NvVarStore. In some cases when the VariableHeader->StartId is VARIABLE_DATA, the VariableHeader->State is not just one of the four primary states: VAR_IN_DELETED_TRANSITION, VAR_DELETED, VAR_HEADER_VALID_ONLY, VAR_ADDED. The state may combined two or three states, e.g. 0x3C =3D (VAR_IN_DELETED_TRANSITION & VAR_ADDED) & VAR_DELETED or 0x3D =3D VAR_ADDED & VAR_DELETED When the variable store has those variables, system booting/rebooting will hangs in a ASSERT: NvVarStore Variable header State was invalid. ASSERT /mnt/working/source_code-git/edk2/OvmfPkg/Library/PlatformInitLib/Platform.= c(819): ((BOOLEAN)(0=3D=3D1)) Adding more log to UpdateVariable() and PlatformValidateNvVarStore(), we saw some variables which have 0x3C or 0x3D state in store. e.g. UpdateVariable(), VariableName=3DBootOrder L1871, State=3D0000003F <-- VAR_ADDED State &=3D VAR_DELETED=3D0000003D FlushHobVariableToFlash(), VariableName=3DBootOrder ... UpdateVariable(), VariableName=3DInitialAttemptOrder L1977, State=3D0000003F State &=3D VAR_IN_DELETED_TRANSITION=3D0000003E L2376, State=3D0000003E State &=3D VAR_DELETED=3D0000003C FlushHobVariableToFlash(), VariableName=3DInitialAttemptOrder ... UpdateVariable(), VariableName=3DConIn L1977, State=3D0000003F State &=3D VAR_IN_DELETED_TRANSITION=3D0000003E L2376, State=3D0000003E State &=3D VAR_DELETED=3D0000003C FlushHobVariableToFlash(), VariableName=3DConIn ... So, only allowing the four primary states is not enough. This patch changes the falid states list (Follow Jiewen Yao's suggestion): 1. VAR_HEADER_VALID_ONLY (0x7F) - Header added (*) 2. VAR_ADDED (0x3F) - Header + data added 3. VAR_ADDED & VAR_IN_DELETED_TRANSITION (0x3E) - marked as deleted, but still valid, before new data is added. (*) 4. VAR_ADDED & VAR_IN_DELETED_TRANSITION & VAR_DELETED (0x3C) - deleted, after new data is added. 5. VAR_ADDED & VAR_DELETED (0x3D) - deleted directly, without new data. (*) means to support surprise shutdown. And removed (VAR_IN_DELETED_TRANSITION) and (VAR_DELETED) because they are invalid states. v2: Follow Jiewen Yao's suggestion to add the following valid states: VAR_ADDED & VAR_DELETED (0x3D) VAR_ADDED & VAR_IN_DELETED_TRANSITION (0x3E)=20 VAR_ADDED & VAR_IN_DELETED_TRANSITION & VAR_DELETED (0x3C) and removed the following invalid states: VAR_IN_DELETED_TRANSITION VAR_DELETED Signed-off-by: "Lee, Chun-Yi" Reviewed-by: Jiewen Yao --- OvmfPkg/Library/PlatformInitLib/Platform.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/Library/PlatformInitLib/Platform.c b/OvmfPkg/Library/P= latformInitLib/Platform.c index 77f22de046..6963c47e0b 100644 --- a/OvmfPkg/Library/PlatformInitLib/Platform.c +++ b/OvmfPkg/Library/PlatformInitLib/Platform.c @@ -702,10 +702,11 @@ PlatformValidateNvVarStore ( =20 VariableOffset =3D NvVarStoreHeader->Size - sizeof (VARIABLE_STORE_H= EADER); } else { - if (!((VariableHeader->State =3D=3D VAR_IN_DELETED_TRANSITION) || - (VariableHeader->State =3D=3D VAR_DELETED) || - (VariableHeader->State =3D=3D VAR_HEADER_VALID_ONLY) || - (VariableHeader->State =3D=3D VAR_ADDED))) + if (!((VariableHeader->State =3D=3D VAR_HEADER_VALID_ONLY) || + (VariableHeader->State =3D=3D VAR_ADDED) || + (VariableHeader->State =3D=3D (VAR_ADDED & VAR_DELETED)) || + (VariableHeader->State =3D=3D (VAR_ADDED & VAR_IN_DELETED_TRANSITION)= ) || + (VariableHeader->State =3D=3D (VAR_ADDED & VAR_IN_DELETED_TRANSITION = & VAR_DELETED)))) { DEBUG ((DEBUG_ERROR, "NvVarStore Variable header State was invalid= .\n")); return FALSE; --=20 2.35.3 -=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 (#97581): https://edk2.groups.io/g/devel/message/97581 Mute This Topic: https://groups.io/mt/95777531/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-