From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web11.6626.1642389099942054263 for ; Sun, 16 Jan 2022 19:11:41 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Mon, 17 Jan 2022 11:11:36 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: , , "'Huang, Long1'" Cc: "'Feng, Bob C'" , "'Chen, Lin Z'" , "'Li, Zhuangzhi'" References: <802446c5bddb6e7de746d733c68d92c0e09e5ca8.1642007174.git.long1.huang@intel.com> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIXSBNZGVNb2R1bGVQa2cvSGlpRGF0YWJhc2VEeGU6IEFkZCBTdXBwb3J0IGZvciBhdXRoZW50aWNhdGVkIHZhcmlhYmxl?= Date: Mon, 17 Jan 2022 11:11:38 +0800 Message-ID: <025c01d80b4f$f115cf90$d3416eb0$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQKtuufG90RREvMYkWpRqGXRS/ulUwHwSo0bA0Pcj7SqkYie0A== Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Dandan: I will review this patch today. Please wait one day for me.=20 Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: devel@edk2.groups.io =B4=FA=B1= =ED Dandan Bi > =B7=A2=CB=CD=CA=B1=BC=E4: 2022=C4=EA1=D4=C217=C8=D5 9:13 > =CA=D5=BC=FE=C8=CB: Huang, Long1 ; devel@edk2.grou= ps.io > =B3=AD=CB=CD: Feng, Bob C ; Gao, Liming > ; Chen, Lin Z ; Li, > Zhuangzhi > =D6=F7=CC=E2: Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabaseDxe: Add > Support for authenticated variable >=20 > I will push this patch today if no other comment. >=20 >=20 > Thanks, > Dandan >=20 > > -----Original Message----- > > From: Bi, Dandan > > Sent: Thursday, January 13, 2022 1:35 PM > > To: Huang, Long1 ; devel@edk2.groups.io > > Cc: Feng, Bob C ; Gao, Liming > > ; Chen, Lin Z ; Li, > > Zhuangzhi > > Subject: RE: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for > > authenticated variable > > > > The change is ok to me. Reviewed-by: Dandan Bi > > > > Hi Liming, > > > > Could you also help review it? > > > > > > Thanks, > > Dandan > > > -----Original Message----- > > > From: Huang, Long1 > > > Sent: Thursday, January 13, 2022 1:06 AM > > > To: devel@edk2.groups.io > > > Cc: Huang, Long1 ; Feng, Bob C > > > ; Gao, Liming ; Bi, > > > Dandan ; Chen, Lin Z ; Li, > > > Zhuangzhi > > > Subject: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for > > > authenticated variable > > > > > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3796 > > > > > > Database.c: > > > 1. Replace PcdGetExPtr with PcdGetExPtr. > > > 2. Add FindAuthVariableData function to parse authenticated > > variable > > > type for getting a correct default value in > > > PcdNvStoreDefaultValueBuffer. > > > > > > Signed-off-by: Huang Long > > > > > > Cc: Bob Feng > > > Cc: Liming Gao > > > Cc: Dandan Bi > > > Cc: Lin Z Chen > > > Cc: Zhuangzhi Li > > > --- > > > .../Universal/HiiDatabaseDxe/Database.c | 130 > ++++++++++++++---- > > > .../HiiDatabaseDxe/HiiDatabaseDxe.inf | 3 + > > > 2 files changed, 105 insertions(+), 28 deletions(-) > > > > > > diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c > > > b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c > > > index 0b09c24d52..c7a92d6aed 100644 > > > --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c > > > +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c > > > @@ -603,6 +603,45 @@ FindVariableData ( > > > return NULL; > > > > > > } > > > > > > > > > > > > +/** > > > > > > + Find the matched authenticated variable from the input variable > storage. > > > > > > + > > > > > > + @param[in] VariableStorage Point to the variable storage header. > > > > > > + @param[in] VarGuid A unique identifier for the variable. > > > > > > + @param[in] VarAttribute The attributes bitmask for the variable= . > > > > > > + @param[in] VarName A Null-terminated ascii string that is > the name > > of > > > the variable. > > > > > > + > > > > > > + @return Pointer to the matched variable header or NULL if not found. > > > > > > +**/ > > > > > > +AUTHENTICATED_VARIABLE_HEADER * > > > > > > +FindAuthVariableData ( > > > > > > + IN VARIABLE_STORE_HEADER *VariableStorage, > > > > > > + IN EFI_GUID *VarGuid, > > > > > > + IN UINT32 VarAttribute, > > > > > > + IN CHAR16 *VarName > > > > > > + ) > > > > > > +{ > > > > > > + AUTHENTICATED_VARIABLE_HEADER *AuthVariableHeader; > > > > > > + AUTHENTICATED_VARIABLE_HEADER *AuthVariableEnd; > > > > > > + > > > > > > + AuthVariableEnd =3D (AUTHENTICATED_VARIABLE_HEADER > *)((UINT8 > > > *)VariableStorage + VariableStorage->Size); > > > > > > + AuthVariableHeader =3D (AUTHENTICATED_VARIABLE_HEADER > > > *)(VariableStorage + 1); > > > > > > + AuthVariableHeader =3D (AUTHENTICATED_VARIABLE_HEADER > > > *)HEADER_ALIGN (AuthVariableHeader); > > > > > > + while (AuthVariableHeader < AuthVariableEnd) { > > > > > > + if (CompareGuid (&AuthVariableHeader->VendorGuid, VarGuid) && > > > > > > + (AuthVariableHeader->Attributes =3D=3D VarAttribute) && > > > > > > + (StrCmp (VarName, (CHAR16 *)(AuthVariableHeader + 1)) =3D=3D > 0)) > > > > > > + { > > > > > > + return AuthVariableHeader; > > > > > > + } > > > > > > + > > > > > > + AuthVariableHeader =3D (AUTHENTICATED_VARIABLE_HEADER > *)((UINT8 > > > *)AuthVariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER) + > > > AuthVariableHeader->NameSize + AuthVariableHeader->DataSize); > > > > > > + AuthVariableHeader =3D (AUTHENTICATED_VARIABLE_HEADER > > > *)HEADER_ALIGN (AuthVariableHeader); > > > > > > + } > > > > > > + > > > > > > + return NULL; > > > > > > +} > > > > > > + > > > > > > /** > > > > > > Find question default value from PcdNvStoreDefaultValueBuffer > > > > > > > > > > > > @@ -626,25 +665,29 @@ FindQuestionDefaultSetting ( > > > IN BOOLEAN BitFieldQuestion > > > > > > ) > > > > > > { > > > > > > - VARIABLE_HEADER *VariableHeader; > > > > > > - VARIABLE_STORE_HEADER *VariableStorage; > > > > > > - LIST_ENTRY *Link; > > > > > > - VARSTORAGE_DEFAULT_DATA *Entry; > > > > > > - VARIABLE_STORE_HEADER *NvStoreBuffer; > > > > > > - UINT8 *DataBuffer; > > > > > > - UINT8 *BufferEnd; > > > > > > - BOOLEAN IsFound; > > > > > > - UINTN Index; > > > > > > - UINT32 BufferValue; > > > > > > - UINT32 BitFieldVal; > > > > > > - UINTN BitOffset; > > > > > > - UINTN ByteOffset; > > > > > > - UINTN BitWidth; > > > > > > - UINTN StartBit; > > > > > > - UINTN EndBit; > > > > > > - PCD_DEFAULT_DATA *DataHeader; > > > > > > - PCD_DEFAULT_INFO *DefaultInfo; > > > > > > - PCD_DATA_DELTA *DeltaData; > > > > > > + VARIABLE_HEADER *VariableHeader; > > > > > > + AUTHENTICATED_VARIABLE_HEADER *AuthVariableHeader; > > > > > > + VARIABLE_STORE_HEADER *VariableStorage; > > > > > > + LIST_ENTRY *Link; > > > > > > + VARSTORAGE_DEFAULT_DATA *Entry; > > > > > > + VARIABLE_STORE_HEADER *NvStoreBuffer; > > > > > > + VOID *ValueSource; > > > > > > + VOID *BitValueSource; > > > > > > + UINT8 *DataBuffer; > > > > > > + UINT8 *BufferEnd; > > > > > > + BOOLEAN AuthFormat; > > > > > > + BOOLEAN IsFound; > > > > > > + UINTN Index; > > > > > > + UINT32 BufferValue; > > > > > > + UINT32 BitFieldVal; > > > > > > + UINTN BitOffset; > > > > > > + UINTN ByteOffset; > > > > > > + UINTN BitWidth; > > > > > > + UINTN StartBit; > > > > > > + UINTN EndBit; > > > > > > + PCD_DEFAULT_DATA *DataHeader; > > > > > > + PCD_DEFAULT_INFO *DefaultInfo; > > > > > > + PCD_DATA_DELTA *DeltaData; > > > > > > > > > > > > if (gSkuId =3D=3D 0xFFFFFFFFFFFFFFFF) { > > > > > > gSkuId =3D LibPcdGetSku (); > > > > > > @@ -666,7 +709,7 @@ FindQuestionDefaultSetting ( > > > } > > > > > > > > > > > > if (Link =3D=3D &gVarStorageList) { > > > > > > - DataBuffer =3D (UINT8 *)PcdGetPtr > (PcdNvStoreDefaultValueBuffer); > > > > > > + DataBuffer =3D (UINT8 *)PcdGetExPtr > > > (&gEfiMdeModulePkgTokenSpaceGuid, PcdNvStoreDefaultValueBuffer); > > > > > > gNvDefaultStoreSize =3D > ((PCD_NV_STORE_DEFAULT_BUFFER_HEADER > > > *)DataBuffer)->Length; > > > > > > // > > > > > > // The first section data includes NV storage default setting. > > > > > > @@ -750,12 +793,27 @@ FindQuestionDefaultSetting ( > > > return EFI_NOT_FOUND; > > > > > > } > > > > > > > > > > > > + // > > > > > > + // Judge if the variable type is authenticated, default is false > > > > > > + // > > > > > > + AuthFormat =3D FALSE; > > > > > > + if (CompareGuid (&VariableStorage->Signature, > > > &gEfiAuthenticatedVariableGuid)) { > > > > > > + AuthFormat =3D TRUE; > > > > > > + } > > > > > > + > > > > > > // > > > > > > // Find the question default value from the variable storage > > > > > > // > > > > > > - VariableHeader =3D FindVariableData (VariableStorage, > > > &EfiVarStore->Guid, > > > EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name); > > > > > > - if (VariableHeader =3D=3D NULL) { > > > > > > - return EFI_NOT_FOUND; > > > > > > + if(AuthFormat) { > > > > > > + AuthVariableHeader =3D FindAuthVariableData (VariableStorage, > > > &EfiVarStore->Guid, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore- > > > >Name); > > > > > > + if (AuthVariableHeader =3D=3D NULL) { > > > > > > + return EFI_NOT_FOUND; > > > > > > + } > > > > > > + } else { > > > > > > + VariableHeader =3D FindVariableData (VariableStorage, > > > + &EfiVarStore->Guid, > > > EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name); > > > > > > + if (VariableHeader =3D=3D NULL) { > > > > > > + return EFI_NOT_FOUND; > > > > > > + } > > > > > > } > > > > > > > > > > > > StartBit =3D 0; > > > > > > @@ -770,8 +828,24 @@ FindQuestionDefaultSetting ( > > > Width =3D EndBit / 8 + 1; > > > > > > } > > > > > > > > > > > > - if (VariableHeader->DataSize < ByteOffset + Width) { > > > > > > - return EFI_INVALID_PARAMETER; > > > > > > + if (AuthFormat) { > > > > > > + if (AuthVariableHeader->DataSize < ByteOffset + Width) { > > > > > > + return EFI_INVALID_PARAMETER; > > > > > > + } > > > > > > + > > > > > > + ValueSource =3D (UINT8 *)AuthVariableHeader + sizeof > > > (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize > > + > > > IfrQuestionHdr->VarStoreInfo.VarOffset; > > > > > > + if (BitFieldQuestion) { > > > > > > + BitValueSource =3D (UINT8 *)AuthVariableHeader + sizeof > > > (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize > > + > > > ByteOffset; > > > > > > + } > > > > > > + } else { > > > > > > + if (VariableHeader->DataSize < ByteOffset + Width) { > > > > > > + return EFI_INVALID_PARAMETER; > > > > > > + } > > > > > > + > > > > > > + ValueSource =3D (UINT8 *)VariableHeader + sizeof > (VARIABLE_HEADER) > > > + + > > > VariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset; > > > > > > + if (BitFieldQuestion) { > > > > > > + BitValueSource =3D (UINT8 *)VariableHeader + sizeof > > > + (VARIABLE_HEADER) > > > + VariableHeader->NameSize + ByteOffset; > > > > > > + } > > > > > > } > > > > > > > > > > > > // > > > > > > @@ -779,11 +853,11 @@ FindQuestionDefaultSetting ( > > > // > > > > > > if (ValueBuffer !=3D NULL) { > > > > > > if (BitFieldQuestion) { > > > > > > - CopyMem (&BufferValue, (UINT8 *)VariableHeader + sizeof > > > (VARIABLE_HEADER) + VariableHeader->NameSize + ByteOffset, Width); > > > > > > + CopyMem (&BufferValue, BitValueSource, Width); > > > > > > BitFieldVal =3D BitFieldRead32 (BufferValue, StartBit, EndBit)= ; > > > > > > CopyMem (ValueBuffer, &BitFieldVal, Width); > > > > > > } else { > > > > > > - CopyMem (ValueBuffer, (UINT8 *)VariableHeader + sizeof > > > (VARIABLE_HEADER) + VariableHeader->NameSize + IfrQuestionHdr- > > > >VarStoreInfo.VarOffset, Width); > > > > > > + CopyMem (ValueBuffer, ValueSource, Width); > > > > > > } > > > > > > } > > > > > > > > > > > > @@ -832,7 +906,7 @@ UpdateDefaultSettingInFormPackage ( > > > // If no default setting, do nothing > > > > > > // > > > > > > if (gNvDefaultStoreSize =3D=3D 0) { > > > > > > - gNvDefaultStoreSize =3D PcdGetSize (PcdNvStoreDefaultValueBuffer= ); > > > > > > + gNvDefaultStoreSize =3D PcdGetExSize > > > (&gEfiMdeModulePkgTokenSpaceGuid, PcdNvStoreDefaultValueBuffer); > > > > > > } > > > > > > > > > > > > if (gNvDefaultStoreSize < sizeof > > > (PCD_NV_STORE_DEFAULT_BUFFER_HEADER)) { > > > > > > diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > > b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > > index 0116fb6ecb..dac4d614a8 100644 > > > --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > > +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > > @@ -86,6 +86,9 @@ > > > gEfiHiiImageDecoderNameJpegGuid > > > |gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol ## > > > SOMETIMES_CONSUMES ## GUID > > > > > > gEfiHiiImageDecoderNamePngGuid > > > |gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol ## > > > SOMETIMES_CONSUMES ## GUID > > > > > > gEdkiiIfrBitVarstoreGuid > ## > > > SOMETIMES_CONSUMES ## GUID > > > > > > + gEfiAuthenticatedVariableGuid > > > > > > + gEfiVariableGuid > > > > > > + gEfiMdeModulePkgTokenSpaceGuid > > > > > > > > > > > > [Depex] > > > > > > TRUE > > > > > > -- > > > 2.25.1 >=20 >=20 >=20 >=20 >=20