From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.29513.1641804385893477000 for ; Mon, 10 Jan 2022 00:46:26 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=cn19xfja; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: long1.huang@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641804385; x=1673340385; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=HLfLeA3fg8A7kiNINgLpSxII98HL1j6vfeNrgu6Z2lI=; b=cn19xfjaS5F0GeVvf1hIS1NWg8PgF0WPWHnMBO/Mz5/KJ5zx3ooUwvLR pO/k2U2YWLuXOoCpapkCBiULYkcepjvVHhc8VYdP3yyFpTaPeBsPgteEl FD6zpMqJI3hYrqe/DN/A+NZjx8k1bIZiFg5tj7GPp5St7bex3tUVOt8zu qqqsrjptNiG5hzSH9jHIfXKZbJSQhLTjqfTkpU4P37UO0z7IU1o0wotyD J/v2VtQd3P0nHyJW3fsbkDzvEMeiOCptt3vAZpMtGPt/M23Hx/fkMY/2O cw6k3tsf61nw5tM6cX13PsznWjcoE+Lx4BMpwPL5aLeMMF5k5LiNRTGDc g==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="240734070" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="240734070" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2022 00:46:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="514602454" Received: from shbiosbuild1001.sh.intel.com ([10.239.132.191]) by orsmga007.jf.intel.com with ESMTP; 10 Jan 2022 00:46:21 -0800 From: "Long1 Huang" To: devel@edk2.groups.io Cc: Huang Long , Liming Gao , Chen Lin Z , Dandan Bi Subject: [PATCH] REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3796 Date: Mon, 10 Jan 2022 16:51:27 +0000 Message-Id: <7c0a5228fe07d13ab34ae53a1965e74ae130c762.1641833074.git.long1.huang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable Database.c: 1. Replace PcdGetExPtr with PcdGetExPtr. 2. Add FindAuthVariableData function to parse authenticated variable type = for getting a correct default value in PcdNvStoreDefaultValueBuffer. Cc: Liming Gao Cc: Chen Lin Z Cc: Dandan Bi Signed-off-by: Huang Long --- .../Universal/HiiDatabaseDxe/Database.c | 147 +++++++++++++----- .../HiiDatabaseDxe/HiiDatabaseDxe.inf | 3 + 2 files changed, 114 insertions(+), 36 deletions(-) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePk= g/Universal/HiiDatabaseDxe/Database.c index 0b09c24d52..c055fa0f29 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c @@ -603,6 +603,45 @@ FindVariableData ( return NULL;=0D }=0D =0D +/**=0D + Find the matched authenticated variable from the input variable storage.= =0D +=0D + @param[in] VariableStorage Point to the variable storage header.=0D + @param[in] VarGuid A unique identifier for the variable.=0D + @param[in] VarAttribute The attributes bitmask for the variable.=0D + @param[in] VarName A Null-terminated ascii string that is the na= me of the variable.=0D +=0D + @return Pointer to the matched variable header or NULL if not found.=0D +**/=0D +AUTHENTICATED_VARIABLE_HEADER *=0D +FindAuthVariableData (=0D + IN VARIABLE_STORE_HEADER *VariableStorage,=0D + IN EFI_GUID *VarGuid,=0D + IN UINT32 VarAttribute,=0D + IN CHAR16 *VarName=0D + )=0D +{=0D + AUTHENTICATED_VARIABLE_HEADER *AuthVariableHeader;=0D + AUTHENTICATED_VARIABLE_HEADER *AuthVariableEnd;=0D +=0D + AuthVariableEnd =3D (AUTHENTICATED_VARIABLE_HEADER *)((UINT8 *)Variab= leStorage + VariableStorage->Size);=0D + AuthVariableHeader =3D (AUTHENTICATED_VARIABLE_HEADER *)(VariableStorage= + 1);=0D + AuthVariableHeader =3D (AUTHENTICATED_VARIABLE_HEADER *)HEADER_ALIGN (Au= thVariableHeader);=0D + while (AuthVariableHeader < AuthVariableEnd) {=0D + if (CompareGuid (&AuthVariableHeader->VendorGuid, VarGuid) &&=0D + (AuthVariableHeader->Attributes =3D=3D VarAttribute) &&=0D + (StrCmp (VarName, (CHAR16 *)(AuthVariableHeader + 1)) =3D=3D 0))=0D + {=0D + return AuthVariableHeader;=0D + }=0D +=0D + AuthVariableHeader =3D (AUTHENTICATED_VARIABLE_HEADER *)((UINT8 *)Auth= VariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeade= r->NameSize + AuthVariableHeader->DataSize);=0D + AuthVariableHeader =3D (AUTHENTICATED_VARIABLE_HEADER *)HEADER_ALIGN (= AuthVariableHeader);=0D + }=0D +=0D + return NULL;=0D +}=0D +=0D /**=0D Find question default value from PcdNvStoreDefaultValueBuffer=0D =0D @@ -626,25 +665,27 @@ FindQuestionDefaultSetting ( IN BOOLEAN BitFieldQuestion=0D )=0D {=0D - VARIABLE_HEADER *VariableHeader;=0D - VARIABLE_STORE_HEADER *VariableStorage;=0D - LIST_ENTRY *Link;=0D - VARSTORAGE_DEFAULT_DATA *Entry;=0D - VARIABLE_STORE_HEADER *NvStoreBuffer;=0D - UINT8 *DataBuffer;=0D - UINT8 *BufferEnd;=0D - BOOLEAN IsFound;=0D - UINTN Index;=0D - UINT32 BufferValue;=0D - UINT32 BitFieldVal;=0D - UINTN BitOffset;=0D - UINTN ByteOffset;=0D - UINTN BitWidth;=0D - UINTN StartBit;=0D - UINTN EndBit;=0D - PCD_DEFAULT_DATA *DataHeader;=0D - PCD_DEFAULT_INFO *DefaultInfo;=0D - PCD_DATA_DELTA *DeltaData;=0D + VARIABLE_HEADER *VariableHeader;=0D + AUTHENTICATED_VARIABLE_HEADER *AuthVariableHeader;=0D + VARIABLE_STORE_HEADER *VariableStorage;=0D + LIST_ENTRY *Link;=0D + VARSTORAGE_DEFAULT_DATA *Entry;=0D + VARIABLE_STORE_HEADER *NvStoreBuffer;=0D + UINT8 *DataBuffer;=0D + UINT8 *BufferEnd;=0D + BOOLEAN AuthFormat;=0D + BOOLEAN IsFound;=0D + UINTN Index;=0D + UINT32 BufferValue;=0D + UINT32 BitFieldVal;=0D + UINTN BitOffset;=0D + UINTN ByteOffset;=0D + UINTN BitWidth;=0D + UINTN StartBit;=0D + UINTN EndBit;=0D + PCD_DEFAULT_DATA *DataHeader;=0D + PCD_DEFAULT_INFO *DefaultInfo;=0D + PCD_DATA_DELTA *DeltaData;=0D =0D if (gSkuId =3D=3D 0xFFFFFFFFFFFFFFFF) {=0D gSkuId =3D LibPcdGetSku ();=0D @@ -666,7 +707,7 @@ FindQuestionDefaultSetting ( }=0D =0D if (Link =3D=3D &gVarStorageList) {=0D - DataBuffer =3D (UINT8 *)PcdGetPtr (PcdNvStoreDefaultValueBuff= er);=0D + DataBuffer =3D (UINT8 *)PcdGetExPtr (&gEfiMdeModulePkgTokenSp= aceGuid, PcdNvStoreDefaultValueBuffer);=0D gNvDefaultStoreSize =3D ((PCD_NV_STORE_DEFAULT_BUFFER_HEADER *)DataBuf= fer)->Length;=0D //=0D // The first section data includes NV storage default setting.=0D @@ -750,12 +791,27 @@ FindQuestionDefaultSetting ( return EFI_NOT_FOUND;=0D }=0D =0D + //=0D + // Judge if the variable type is authenticated, default is false=0D + //=0D + AuthFormat =3D FALSE;=0D + if (CompareGuid (&VariableStorage->Signature, &gEfiAuthenticatedVariable= Guid)) {=0D + AuthFormat =3D TRUE;=0D + }=0D +=0D //=0D // Find the question default value from the variable storage=0D //=0D - VariableHeader =3D FindVariableData (VariableStorage, &EfiVarStore->Guid= , EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);=0D - if (VariableHeader =3D=3D NULL) {=0D - return EFI_NOT_FOUND;=0D + if(AuthFormat) {=0D + AuthVariableHeader =3D FindAuthVariableData (VariableStorage, &EfiVarS= tore->Guid, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);=0D + if (AuthVariableHeader =3D=3D NULL) {=0D + return EFI_NOT_FOUND;=0D + }=0D + } else {=0D + VariableHeader =3D FindVariableData (VariableStorage, &EfiVarStore->Gu= id, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);=0D + if (VariableHeader =3D=3D NULL) {=0D + return EFI_NOT_FOUND;=0D + }=0D }=0D =0D StartBit =3D 0;=0D @@ -770,20 +826,39 @@ FindQuestionDefaultSetting ( Width =3D EndBit / 8 + 1;=0D }=0D =0D - if (VariableHeader->DataSize < ByteOffset + Width) {=0D - return EFI_INVALID_PARAMETER;=0D - }=0D + if(AuthFormat) {=0D + if (AuthVariableHeader->DataSize < ByteOffset + Width) {=0D + return EFI_INVALID_PARAMETER;=0D + }=0D =0D - //=0D - // Copy the question value=0D - //=0D - if (ValueBuffer !=3D NULL) {=0D - if (BitFieldQuestion) {=0D - CopyMem (&BufferValue, (UINT8 *)VariableHeader + sizeof (VARIABLE_HE= ADER) + VariableHeader->NameSize + ByteOffset, Width);=0D - BitFieldVal =3D BitFieldRead32 (BufferValue, StartBit, EndBit);=0D - CopyMem (ValueBuffer, &BitFieldVal, Width);=0D - } else {=0D - CopyMem (ValueBuffer, (UINT8 *)VariableHeader + sizeof (VARIABLE_HEA= DER) + VariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset, W= idth);=0D + //=0D + // Copy the question value=0D + //=0D + if (ValueBuffer !=3D NULL) {=0D + if (BitFieldQuestion) {=0D + CopyMem (&BufferValue, (UINT8 *)AuthVariableHeader + sizeof (AUTHE= NTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize + ByteOffset, Widt= h);=0D + BitFieldVal =3D BitFieldRead32 (BufferValue, StartBit, EndBit);=0D + CopyMem (ValueBuffer, &BitFieldVal, Width);=0D + } else {=0D + CopyMem (ValueBuffer, (UINT8 *)AuthVariableHeader + sizeof (AUTHEN= TICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize + IfrQuestionHdr->V= arStoreInfo.VarOffset, Width);=0D + }=0D + }=0D + } else {=0D + if (VariableHeader->DataSize < ByteOffset + Width) {=0D + return EFI_INVALID_PARAMETER;=0D + }=0D +=0D + //=0D + // Copy the question value=0D + //=0D + if (ValueBuffer !=3D NULL) {=0D + if (BitFieldQuestion) {=0D + CopyMem (&BufferValue, (UINT8 *)VariableHeader + sizeof (VARIABLE_= HEADER) + VariableHeader->NameSize + ByteOffset, Width);=0D + BitFieldVal =3D BitFieldRead32 (BufferValue, StartBit, EndBit);=0D + CopyMem (ValueBuffer, &BitFieldVal, Width);=0D + } else {=0D + CopyMem (ValueBuffer, (UINT8 *)VariableHeader + sizeof (VARIABLE_H= EADER) + VariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset,= Width);=0D + }=0D }=0D }=0D =0D diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/Mde= ModulePkg/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.PcdSuppo= rtHiiImageProtocol ## SOMETIMES_CONSUMES ## GUID=0D gEfiHiiImageDecoderNamePngGuid |gEfiMdeModulePkgTokenSpaceGuid.PcdSuppo= rtHiiImageProtocol ## SOMETIMES_CONSUMES ## GUID=0D gEdkiiIfrBitVarstoreGuid = ## SOMETIMES_CONSUMES ## GUID=0D + gEfiAuthenticatedVariableGuid=0D + gEfiVariableGuid=0D + gEfiMdeModulePkgTokenSpaceGuid=0D =0D [Depex]=0D TRUE=0D --=20 2.25.1