From nobody Wed May 15 00:15:30 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+94446+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+94446+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=kunluntech.com.cn ARC-Seal: i=1; a=rsa-sha256; t=1664334327; cv=none; d=zohomail.com; s=zohoarc; b=VsfvA2aDwZwvbd4+jVryCvnP7aooBDoANWIx6SWRmmbK46FnZYEknInPVPwz6fmuBV8WZfcI8iU2WQ5vtl6a4STs7VsVWSkstbRaofPJwoXUmAEcnV4S7/x/e7c9rRUi3buol5cu4Qne6/bNw0RVi5CMvKrdZpOVP0LV+RdxYZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664334327; h=Content-Type:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=/OYjEbWZfEFDbn4SGJhTK00kgNK4MOX6q2+9F7HIhvo=; b=G1POJgwm9L28cWVT6TF6bF50Cml4HzjNFaWTdvuY5URr6nXCGHWL+GHXRuTeOM3gVdEDTMrV4Y23B69wZEjKlC+n0H8BC/4gINg9HR0LG8bLYSMHEERIiW9NOcR7cbGRPB+cMO/c6bdJ4ZTUZfIyCz4Ziq0hQe1bB9KtCOgFXSQ= 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+94446+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 1664334327453753.9646222827428; Tue, 27 Sep 2022 20:05:27 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ANPvYY1788612xAb2ysaCZ0q; Tue, 27 Sep 2022 20:05:27 -0700 Subject: [edk2-devel] [PATCH] MdeModulePkg VariablePei: Add Variable state check when find variable in IndexTable. To: devel@edk2.groups.io From: "Jiading Zhang" X-Originating-Location: Beijing, CN (218.247.145.3) X-Originating-Platform: Windows Chrome 105 User-Agent: GROUPS.IO Web Poster MIME-Version: 1.0 Date: Tue, 27 Sep 2022 20:05:23 -0700 Message-ID: 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,jdzhang@kunluntech.com.cn X-Gm-Message-State: bl5tO3gplHJKew6P3lMJ7cukx1787277AA= Content-Type: multipart/mixed; boundary="vk03KtvFt6jYpPV1zYsC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1664334327; bh=J+xyJ1+T+gvOc7sdD3PFgYXcy6FlPcugbjYiVsjW1F8=; h=Content-Type:Date:From:Reply-To:Subject:To; b=RQtCJkifyDTOHce3CJW8pTyPP1bWPfgdgLHnNY285SkcHeqF2ffIsZuz8udlOOwpfwz m/+K+9SxSrd58ArU0YKMtRRbjhLVz9IixILjRRMGIIa6k0gDzV7w41PASWIIpfTvhKHHn 7X39Nb2DW0ogV6GKv9yH1G+N00cn6x1FMUA= X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1664334329065100002 --vk03KtvFt6jYpPV1zYsC Content-Type: multipart/alternative; boundary="CtBty6iEsbJ9M5sPnGqs" --CtBty6iEsbJ9M5sPnGqs Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When read a variable in PEI, it will find it first in the HOB, then find in= variable store. When find in variable store, it will check the variable st= ate, but find in HOB, it doesn't check the state, so if the variable was ch= anged, it will find the obsolete variable in the HOB. Signed-off-by: jdzhang --- MdeModulePkg/Universal/Variable/Pei/Variable.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/= Universal/Variable/Pei/Variable.c index 26a4c73b45..dffbd8cdb1 100644 --- a/MdeModulePkg/Universal/Variable/Pei/Variable.c +++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c @@ -866,11 +866,13 @@ FindVariableEx ( Offset=C2=A0 +=3D IndexTable->Index[Index]; MaxIndex =3D (VARIABLE_HEADER *)((UINT8 *)IndexTable->StartPtr + Offset); GetVariableHeader (StoreInfo, MaxIndex, &VariableHeader); -=C2=A0 =C2=A0 =C2=A0 if (CompareWithValidVariable (StoreInfo, MaxIndex, Va= riableHeader, VariableName, VendorGuid, PtrTrack) =3D=3D EFI_SUCCESS) { -=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (VariableHeader->State =3D=3D (VAR_IN_DELET= ED_TRANSITION & VAR_ADDED)) { -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 InDeletedVariable =3D PtrTrack->CurrPtr= ; -=C2=A0 =C2=A0 =C2=A0 =C2=A0 } else { -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return EFI_SUCCESS; +=C2=A0 =C2=A0 =C2=A0 if ((VariableHeader->State =3D=3D VAR_ADDED) || (Vari= ableHeader->State =3D=3D (VAR_IN_DELETED_TRANSITION & VAR_ADDED))) { +=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (CompareWithValidVariable (StoreInfo, MaxIn= dex, VariableHeader, VariableName, VendorGuid, PtrTrack) =3D=3D EFI_SUCCESS= ) { +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (VariableHeader->State =3D=3D (VAR_I= N_DELETED_TRANSITION & VAR_ADDED)) { +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 InDeletedVariable =3D PtrTrack->= CurrPtr; +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 } else { +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return EFI_SUCCESS; +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 } } } } -- 2.20.1.windows.1 -=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 (#94446): https://edk2.groups.io/g/devel/message/94446 Mute This Topic: https://groups.io/mt/93965445/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- --CtBty6iEsbJ9M5sPnGqs Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable
When read a variable in PEI, it will find it first in the HOB, then fi= nd in variable store. When find in variable store, it will check the variab= le state, but find in HOB, it doesn't check the state, so if the variable w= as changed, it will find the obsolete variable in the HOB.
 
Signed-off-by: jdzhang <jdzhang@kunluntech.com.cn>
---
 MdeModulePkg/Universal/Variable/Pei/Variable.c | 12 +++++++-----=
 1 file changed, 7 insertions(+), 5 deletions(-)
 
diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModul= ePkg/Universal/Variable/Pei/Variable.c
index 26a4c73b45..dffbd8cdb1 100644
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -866,11 +866,13 @@ FindVariableEx (
       Offset  +=3D IndexTable->Index[Inde= x];
       MaxIndex =3D (VARIABLE_HEADER *)((UINT8 *)I= ndexTable->StartPtr + Offset);
       GetVariableHeader (StoreInfo, MaxIndex, &am= p;VariableHeader);
-      if (CompareWithValidVariable (StoreInfo, MaxInde= x, VariableHeader, VariableName, VendorGuid, PtrTrack) =3D=3D EFI_SUCCESS) = {
-        if (VariableHeader->State =3D=3D (VAR_= IN_DELETED_TRANSITION & VAR_ADDED)) {
-          InDeletedVariable =3D PtrTrack->= ;CurrPtr;
-        } else {
-          return EFI_SUCCESS;
+      if ((VariableHeader->State =3D=3D VAR_ADDED) = || (VariableHeader->State =3D=3D (VAR_IN_DELETED_TRANSITION & VAR_AD= DED))) {
+        if (CompareWithValidVariable (StoreInfo, = MaxIndex, VariableHeader, VariableName, VendorGuid, PtrTrack) =3D=3D EFI_SU= CCESS) {
+          if (VariableHeader->State =3D= =3D (VAR_IN_DELETED_TRANSITION & VAR_ADDED)) {
+            InDeletedVariable =3D PtrTr= ack->CurrPtr;
+          } else {
+            return EFI_SUCCESS;
+          }
         }
       }
     }
-- 
2.20.1.windows.1
 
_._,_._,_
G= roups.io Links:

You receive all messages sent to this group.

Vi= ew/Reply Online (#94446) | | Mute This Topic | New Topic
Your Subscription | Contact Group Owner | Unsubscribe [importer@patchew.org]
_._,_._,_=20 --CtBty6iEsbJ9M5sPnGqs-- --vk03KtvFt6jYpPV1zYsC Content-Type: text/plain; name="0001-MdeModulePkg-VariablePei-Add-Variable-state-check-wh.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-MdeModulePkg-VariablePei-Add-Variable-state-check-wh.patch" RnJvbSBkMGExZTM4NGFkMDQxODVjYWI5MTVkMmQ1NzdhYzg1NDE2OWMzOTIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBqZHpoYW5nIDxqZHpoYW5nQGt1bmx1bnRlY2guY29tLmNuPgpE YXRlOiBXZWQsIDI4IFNlcCAyMDIyIDEwOjU3OjQ3ICswODAwClN1YmplY3Q6IFtQQVRDSF0gTWRl TW9kdWxlUGtnIFZhcmlhYmxlUGVpOiBBZGQgVmFyaWFibGUgc3RhdGUgY2hlY2sgd2hlbiBmaW5k CiB2YXJpYWJsZSBpbiBJbmRleFRhYmxlLgoKV2hlbiByZWFkIGEgdmFyaWFibGUgaW4gUEVJLCBp dCB3aWxsIGZpbmQgaXQgZmlyc3QgaW4gdGhlIEhPQiwgdGhlbiBmaW5kIGluIHZhcmlhYmxlIHN0 b3JlLiBXaGVuIGZpbmQgaW4gdmFyaWFibGUgc3RvcmUsIGl0IHdpbGwgY2hlY2sgdGhlIHZhcmlh YmxlIHN0YXRlLCBidXQgZmluZCBpbiBIT0IsIGl0IGRvZXNuJ3QgY2hlY2sgdGhlIHN0YXRlLCBz byBpZiB0aGUgdmFyaWFibGUgd2FzIGNoYW5nZWQsIGl0IHdpbGwgZmluZCB0aGUgb2Jzb2xldGUg dmFyaWFibGUgaW4gdGhlIEhPQi4KClNpZ25lZC1vZmYtYnk6IGpkemhhbmcgPGpkemhhbmdAa3Vu bHVudGVjaC5jb20uY24+Ci0tLQogTWRlTW9kdWxlUGtnL1VuaXZlcnNhbC9WYXJpYWJsZS9QZWkv VmFyaWFibGUuYyB8IDEyICsrKysrKystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9u cygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9NZGVNb2R1bGVQa2cvVW5pdmVyc2Fs L1ZhcmlhYmxlL1BlaS9WYXJpYWJsZS5jIGIvTWRlTW9kdWxlUGtnL1VuaXZlcnNhbC9WYXJpYWJs ZS9QZWkvVmFyaWFibGUuYwppbmRleCAyNmE0YzczYjQ1Li5kZmZiZDhjZGIxIDEwMDY0NAotLS0g YS9NZGVNb2R1bGVQa2cvVW5pdmVyc2FsL1ZhcmlhYmxlL1BlaS9WYXJpYWJsZS5jCisrKyBiL01k ZU1vZHVsZVBrZy9Vbml2ZXJzYWwvVmFyaWFibGUvUGVpL1ZhcmlhYmxlLmMKQEAgLTg2NiwxMSAr ODY2LDEzIEBAIEZpbmRWYXJpYWJsZUV4ICgKICAgICAgIE9mZnNldCAgKz0gSW5kZXhUYWJsZS0+ SW5kZXhbSW5kZXhdOw0KICAgICAgIE1heEluZGV4ID0gKFZBUklBQkxFX0hFQURFUiAqKSgoVUlO VDggKilJbmRleFRhYmxlLT5TdGFydFB0ciArIE9mZnNldCk7DQogICAgICAgR2V0VmFyaWFibGVI ZWFkZXIgKFN0b3JlSW5mbywgTWF4SW5kZXgsICZWYXJpYWJsZUhlYWRlcik7DQotICAgICAgaWYg KENvbXBhcmVXaXRoVmFsaWRWYXJpYWJsZSAoU3RvcmVJbmZvLCBNYXhJbmRleCwgVmFyaWFibGVI ZWFkZXIsIFZhcmlhYmxlTmFtZSwgVmVuZG9yR3VpZCwgUHRyVHJhY2spID09IEVGSV9TVUNDRVNT KSB7DQotICAgICAgICBpZiAoVmFyaWFibGVIZWFkZXItPlN0YXRlID09IChWQVJfSU5fREVMRVRF RF9UUkFOU0lUSU9OICYgVkFSX0FEREVEKSkgew0KLSAgICAgICAgICBJbkRlbGV0ZWRWYXJpYWJs ZSA9IFB0clRyYWNrLT5DdXJyUHRyOw0KLSAgICAgICAgfSBlbHNlIHsNCi0gICAgICAgICAgcmV0 dXJuIEVGSV9TVUNDRVNTOw0KKyAgICAgIGlmICgoVmFyaWFibGVIZWFkZXItPlN0YXRlID09IFZB Ul9BRERFRCkgfHwgKFZhcmlhYmxlSGVhZGVyLT5TdGF0ZSA9PSAoVkFSX0lOX0RFTEVURURfVFJB TlNJVElPTiAmIFZBUl9BRERFRCkpKSB7DQorICAgICAgICBpZiAoQ29tcGFyZVdpdGhWYWxpZFZh cmlhYmxlIChTdG9yZUluZm8sIE1heEluZGV4LCBWYXJpYWJsZUhlYWRlciwgVmFyaWFibGVOYW1l LCBWZW5kb3JHdWlkLCBQdHJUcmFjaykgPT0gRUZJX1NVQ0NFU1MpIHsNCisgICAgICAgICAgaWYg KFZhcmlhYmxlSGVhZGVyLT5TdGF0ZSA9PSAoVkFSX0lOX0RFTEVURURfVFJBTlNJVElPTiAmIFZB Ul9BRERFRCkpIHsNCisgICAgICAgICAgICBJbkRlbGV0ZWRWYXJpYWJsZSA9IFB0clRyYWNrLT5D dXJyUHRyOw0KKyAgICAgICAgICB9IGVsc2Ugew0KKyAgICAgICAgICAgIHJldHVybiBFRklfU1VD Q0VTUzsNCisgICAgICAgICAgfQ0KICAgICAgICAgfQ0KICAgICAgIH0NCiAgICAgfQ0KLS0gCjIu MjAuMS53aW5kb3dzLjEKCg== --vk03KtvFt6jYpPV1zYsC--