* [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable
@ 2022-01-12 17:06 Long1 Huang
2022-01-13 5:34 ` Dandan Bi
2022-01-19 1:59 ` Ni, Ray
0 siblings, 2 replies; 7+ messages in thread
From: Long1 Huang @ 2022-01-12 17:06 UTC (permalink / raw)
To: devel; +Cc: Huang Long, Bob Feng, Liming Gao, Dandan Bi, Lin Z Chen,
Zhuangzhi Li
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3796
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 <long1.huang@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Lin Z Chen <lin.z.chen@intel.com>
Cc: Zhuangzhi Li <zhuangzhi.li@intel.com>
---
.../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 = (AUTHENTICATED_VARIABLE_HEADER *)((UINT8 *)VariableStorage + VariableStorage->Size);
+ AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER *)(VariableStorage + 1);
+ AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER *)HEADER_ALIGN (AuthVariableHeader);
+ while (AuthVariableHeader < AuthVariableEnd) {
+ if (CompareGuid (&AuthVariableHeader->VendorGuid, VarGuid) &&
+ (AuthVariableHeader->Attributes == VarAttribute) &&
+ (StrCmp (VarName, (CHAR16 *)(AuthVariableHeader + 1)) == 0))
+ {
+ return AuthVariableHeader;
+ }
+
+ AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER *)((UINT8 *)AuthVariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize + AuthVariableHeader->DataSize);
+ AuthVariableHeader = (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 == 0xFFFFFFFFFFFFFFFF) {
gSkuId = LibPcdGetSku ();
@@ -666,7 +709,7 @@ FindQuestionDefaultSetting (
}
if (Link == &gVarStorageList) {
- DataBuffer = (UINT8 *)PcdGetPtr (PcdNvStoreDefaultValueBuffer);
+ DataBuffer = (UINT8 *)PcdGetExPtr (&gEfiMdeModulePkgTokenSpaceGuid, PcdNvStoreDefaultValueBuffer);
gNvDefaultStoreSize = ((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 = FALSE;
+ if (CompareGuid (&VariableStorage->Signature, &gEfiAuthenticatedVariableGuid)) {
+ AuthFormat = TRUE;
+ }
+
//
// Find the question default value from the variable storage
//
- VariableHeader = FindVariableData (VariableStorage, &EfiVarStore->Guid, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
- if (VariableHeader == NULL) {
- return EFI_NOT_FOUND;
+ if(AuthFormat) {
+ AuthVariableHeader = FindAuthVariableData (VariableStorage, &EfiVarStore->Guid, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
+ if (AuthVariableHeader == NULL) {
+ return EFI_NOT_FOUND;
+ }
+ } else {
+ VariableHeader = FindVariableData (VariableStorage, &EfiVarStore->Guid, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
+ if (VariableHeader == NULL) {
+ return EFI_NOT_FOUND;
+ }
}
StartBit = 0;
@@ -770,8 +828,24 @@ FindQuestionDefaultSetting (
Width = EndBit / 8 + 1;
}
- if (VariableHeader->DataSize < ByteOffset + Width) {
- return EFI_INVALID_PARAMETER;
+ if (AuthFormat) {
+ if (AuthVariableHeader->DataSize < ByteOffset + Width) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ ValueSource = (UINT8 *)AuthVariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset;
+ if (BitFieldQuestion) {
+ BitValueSource = (UINT8 *)AuthVariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize + ByteOffset;
+ }
+ } else {
+ if (VariableHeader->DataSize < ByteOffset + Width) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ ValueSource = (UINT8 *)VariableHeader + sizeof (VARIABLE_HEADER) + VariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset;
+ if (BitFieldQuestion) {
+ BitValueSource = (UINT8 *)VariableHeader + sizeof (VARIABLE_HEADER) + VariableHeader->NameSize + ByteOffset;
+ }
}
//
@@ -779,11 +853,11 @@ FindQuestionDefaultSetting (
//
if (ValueBuffer != NULL) {
if (BitFieldQuestion) {
- CopyMem (&BufferValue, (UINT8 *)VariableHeader + sizeof (VARIABLE_HEADER) + VariableHeader->NameSize + ByteOffset, Width);
+ CopyMem (&BufferValue, BitValueSource, Width);
BitFieldVal = 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 == 0) {
- gNvDefaultStoreSize = PcdGetSize (PcdNvStoreDefaultValueBuffer);
+ gNvDefaultStoreSize = 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
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable
2022-01-12 17:06 [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable Long1 Huang
@ 2022-01-13 5:34 ` Dandan Bi
2022-01-17 1:13 ` Dandan Bi
2022-01-19 1:59 ` Ni, Ray
1 sibling, 1 reply; 7+ messages in thread
From: Dandan Bi @ 2022-01-13 5:34 UTC (permalink / raw)
To: Huang, Long1, devel@edk2.groups.io
Cc: Feng, Bob C, Gao, Liming, Chen, Lin Z, Li, Zhuangzhi
The change is ok to me. Reviewed-by: Dandan Bi <dandan.bi@intel.com>
Hi Liming,
Could you also help review it?
Thanks,
Dandan
> -----Original Message-----
> From: Huang, Long1 <long1.huang@intel.com>
> Sent: Thursday, January 13, 2022 1:06 AM
> To: devel@edk2.groups.io
> Cc: Huang, Long1 <long1.huang@intel.com>; Feng, Bob C
> <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Bi,
> Dandan <dandan.bi@intel.com>; Chen, Lin Z <lin.z.chen@intel.com>; Li,
> Zhuangzhi <zhuangzhi.li@intel.com>
> Subject: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for
> authenticated variable
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3796
>
> 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 <long1.huang@intel.com>
>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Lin Z Chen <lin.z.chen@intel.com>
> Cc: Zhuangzhi Li <zhuangzhi.li@intel.com>
> ---
> .../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 = (AUTHENTICATED_VARIABLE_HEADER *)((UINT8
> *)VariableStorage + VariableStorage->Size);
>
> + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER
> *)(VariableStorage + 1);
>
> + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER
> *)HEADER_ALIGN (AuthVariableHeader);
>
> + while (AuthVariableHeader < AuthVariableEnd) {
>
> + if (CompareGuid (&AuthVariableHeader->VendorGuid, VarGuid) &&
>
> + (AuthVariableHeader->Attributes == VarAttribute) &&
>
> + (StrCmp (VarName, (CHAR16 *)(AuthVariableHeader + 1)) == 0))
>
> + {
>
> + return AuthVariableHeader;
>
> + }
>
> +
>
> + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER *)((UINT8
> *)AuthVariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER) +
> AuthVariableHeader->NameSize + AuthVariableHeader->DataSize);
>
> + AuthVariableHeader = (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 == 0xFFFFFFFFFFFFFFFF) {
>
> gSkuId = LibPcdGetSku ();
>
> @@ -666,7 +709,7 @@ FindQuestionDefaultSetting (
> }
>
>
>
> if (Link == &gVarStorageList) {
>
> - DataBuffer = (UINT8 *)PcdGetPtr (PcdNvStoreDefaultValueBuffer);
>
> + DataBuffer = (UINT8 *)PcdGetExPtr
> (&gEfiMdeModulePkgTokenSpaceGuid, PcdNvStoreDefaultValueBuffer);
>
> gNvDefaultStoreSize = ((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 = FALSE;
>
> + if (CompareGuid (&VariableStorage->Signature,
> &gEfiAuthenticatedVariableGuid)) {
>
> + AuthFormat = TRUE;
>
> + }
>
> +
>
> //
>
> // Find the question default value from the variable storage
>
> //
>
> - VariableHeader = FindVariableData (VariableStorage, &EfiVarStore->Guid,
> EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
>
> - if (VariableHeader == NULL) {
>
> - return EFI_NOT_FOUND;
>
> + if(AuthFormat) {
>
> + AuthVariableHeader = FindAuthVariableData (VariableStorage,
> &EfiVarStore->Guid, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore-
> >Name);
>
> + if (AuthVariableHeader == NULL) {
>
> + return EFI_NOT_FOUND;
>
> + }
>
> + } else {
>
> + VariableHeader = FindVariableData (VariableStorage, &EfiVarStore->Guid,
> EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
>
> + if (VariableHeader == NULL) {
>
> + return EFI_NOT_FOUND;
>
> + }
>
> }
>
>
>
> StartBit = 0;
>
> @@ -770,8 +828,24 @@ FindQuestionDefaultSetting (
> Width = EndBit / 8 + 1;
>
> }
>
>
>
> - if (VariableHeader->DataSize < ByteOffset + Width) {
>
> - return EFI_INVALID_PARAMETER;
>
> + if (AuthFormat) {
>
> + if (AuthVariableHeader->DataSize < ByteOffset + Width) {
>
> + return EFI_INVALID_PARAMETER;
>
> + }
>
> +
>
> + ValueSource = (UINT8 *)AuthVariableHeader + sizeof
> (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize +
> IfrQuestionHdr->VarStoreInfo.VarOffset;
>
> + if (BitFieldQuestion) {
>
> + BitValueSource = (UINT8 *)AuthVariableHeader + sizeof
> (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize +
> ByteOffset;
>
> + }
>
> + } else {
>
> + if (VariableHeader->DataSize < ByteOffset + Width) {
>
> + return EFI_INVALID_PARAMETER;
>
> + }
>
> +
>
> + ValueSource = (UINT8 *)VariableHeader + sizeof (VARIABLE_HEADER) +
> VariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset;
>
> + if (BitFieldQuestion) {
>
> + BitValueSource = (UINT8 *)VariableHeader + sizeof (VARIABLE_HEADER)
> + VariableHeader->NameSize + ByteOffset;
>
> + }
>
> }
>
>
>
> //
>
> @@ -779,11 +853,11 @@ FindQuestionDefaultSetting (
> //
>
> if (ValueBuffer != NULL) {
>
> if (BitFieldQuestion) {
>
> - CopyMem (&BufferValue, (UINT8 *)VariableHeader + sizeof
> (VARIABLE_HEADER) + VariableHeader->NameSize + ByteOffset, Width);
>
> + CopyMem (&BufferValue, BitValueSource, Width);
>
> BitFieldVal = 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 == 0) {
>
> - gNvDefaultStoreSize = PcdGetSize (PcdNvStoreDefaultValueBuffer);
>
> + gNvDefaultStoreSize = 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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable
2022-01-13 5:34 ` Dandan Bi
@ 2022-01-17 1:13 ` Dandan Bi
2022-01-17 3:11 ` 回复: [edk2-devel] " gaoliming
0 siblings, 1 reply; 7+ messages in thread
From: Dandan Bi @ 2022-01-17 1:13 UTC (permalink / raw)
To: Huang, Long1, devel@edk2.groups.io
Cc: Feng, Bob C, Gao, Liming, Chen, Lin Z, Li, Zhuangzhi
I will push this patch today if no other comment.
Thanks,
Dandan
> -----Original Message-----
> From: Bi, Dandan
> Sent: Thursday, January 13, 2022 1:35 PM
> To: Huang, Long1 <long1.huang@intel.com>; devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Chen, Lin Z <lin.z.chen@intel.com>; Li,
> Zhuangzhi <zhuangzhi.li@intel.com>
> Subject: RE: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for
> authenticated variable
>
> The change is ok to me. Reviewed-by: Dandan Bi <dandan.bi@intel.com>
>
> Hi Liming,
>
> Could you also help review it?
>
>
> Thanks,
> Dandan
> > -----Original Message-----
> > From: Huang, Long1 <long1.huang@intel.com>
> > Sent: Thursday, January 13, 2022 1:06 AM
> > To: devel@edk2.groups.io
> > Cc: Huang, Long1 <long1.huang@intel.com>; Feng, Bob C
> > <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Bi,
> > Dandan <dandan.bi@intel.com>; Chen, Lin Z <lin.z.chen@intel.com>; Li,
> > Zhuangzhi <zhuangzhi.li@intel.com>
> > Subject: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for
> > authenticated variable
> >
> > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3796
> >
> > 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 <long1.huang@intel.com>
> >
> > Cc: Bob Feng <bob.c.feng@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Dandan Bi <dandan.bi@intel.com>
> > Cc: Lin Z Chen <lin.z.chen@intel.com>
> > Cc: Zhuangzhi Li <zhuangzhi.li@intel.com>
> > ---
> > .../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 = (AUTHENTICATED_VARIABLE_HEADER *)((UINT8
> > *)VariableStorage + VariableStorage->Size);
> >
> > + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER
> > *)(VariableStorage + 1);
> >
> > + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER
> > *)HEADER_ALIGN (AuthVariableHeader);
> >
> > + while (AuthVariableHeader < AuthVariableEnd) {
> >
> > + if (CompareGuid (&AuthVariableHeader->VendorGuid, VarGuid) &&
> >
> > + (AuthVariableHeader->Attributes == VarAttribute) &&
> >
> > + (StrCmp (VarName, (CHAR16 *)(AuthVariableHeader + 1)) == 0))
> >
> > + {
> >
> > + return AuthVariableHeader;
> >
> > + }
> >
> > +
> >
> > + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER *)((UINT8
> > *)AuthVariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER) +
> > AuthVariableHeader->NameSize + AuthVariableHeader->DataSize);
> >
> > + AuthVariableHeader = (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 == 0xFFFFFFFFFFFFFFFF) {
> >
> > gSkuId = LibPcdGetSku ();
> >
> > @@ -666,7 +709,7 @@ FindQuestionDefaultSetting (
> > }
> >
> >
> >
> > if (Link == &gVarStorageList) {
> >
> > - DataBuffer = (UINT8 *)PcdGetPtr (PcdNvStoreDefaultValueBuffer);
> >
> > + DataBuffer = (UINT8 *)PcdGetExPtr
> > (&gEfiMdeModulePkgTokenSpaceGuid, PcdNvStoreDefaultValueBuffer);
> >
> > gNvDefaultStoreSize = ((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 = FALSE;
> >
> > + if (CompareGuid (&VariableStorage->Signature,
> > &gEfiAuthenticatedVariableGuid)) {
> >
> > + AuthFormat = TRUE;
> >
> > + }
> >
> > +
> >
> > //
> >
> > // Find the question default value from the variable storage
> >
> > //
> >
> > - VariableHeader = FindVariableData (VariableStorage,
> > &EfiVarStore->Guid,
> > EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
> >
> > - if (VariableHeader == NULL) {
> >
> > - return EFI_NOT_FOUND;
> >
> > + if(AuthFormat) {
> >
> > + AuthVariableHeader = FindAuthVariableData (VariableStorage,
> > &EfiVarStore->Guid, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore-
> > >Name);
> >
> > + if (AuthVariableHeader == NULL) {
> >
> > + return EFI_NOT_FOUND;
> >
> > + }
> >
> > + } else {
> >
> > + VariableHeader = FindVariableData (VariableStorage,
> > + &EfiVarStore->Guid,
> > EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
> >
> > + if (VariableHeader == NULL) {
> >
> > + return EFI_NOT_FOUND;
> >
> > + }
> >
> > }
> >
> >
> >
> > StartBit = 0;
> >
> > @@ -770,8 +828,24 @@ FindQuestionDefaultSetting (
> > Width = EndBit / 8 + 1;
> >
> > }
> >
> >
> >
> > - if (VariableHeader->DataSize < ByteOffset + Width) {
> >
> > - return EFI_INVALID_PARAMETER;
> >
> > + if (AuthFormat) {
> >
> > + if (AuthVariableHeader->DataSize < ByteOffset + Width) {
> >
> > + return EFI_INVALID_PARAMETER;
> >
> > + }
> >
> > +
> >
> > + ValueSource = (UINT8 *)AuthVariableHeader + sizeof
> > (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize
> +
> > IfrQuestionHdr->VarStoreInfo.VarOffset;
> >
> > + if (BitFieldQuestion) {
> >
> > + BitValueSource = (UINT8 *)AuthVariableHeader + sizeof
> > (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize
> +
> > ByteOffset;
> >
> > + }
> >
> > + } else {
> >
> > + if (VariableHeader->DataSize < ByteOffset + Width) {
> >
> > + return EFI_INVALID_PARAMETER;
> >
> > + }
> >
> > +
> >
> > + ValueSource = (UINT8 *)VariableHeader + sizeof (VARIABLE_HEADER)
> > + +
> > VariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset;
> >
> > + if (BitFieldQuestion) {
> >
> > + BitValueSource = (UINT8 *)VariableHeader + sizeof
> > + (VARIABLE_HEADER)
> > + VariableHeader->NameSize + ByteOffset;
> >
> > + }
> >
> > }
> >
> >
> >
> > //
> >
> > @@ -779,11 +853,11 @@ FindQuestionDefaultSetting (
> > //
> >
> > if (ValueBuffer != NULL) {
> >
> > if (BitFieldQuestion) {
> >
> > - CopyMem (&BufferValue, (UINT8 *)VariableHeader + sizeof
> > (VARIABLE_HEADER) + VariableHeader->NameSize + ByteOffset, Width);
> >
> > + CopyMem (&BufferValue, BitValueSource, Width);
> >
> > BitFieldVal = 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 == 0) {
> >
> > - gNvDefaultStoreSize = PcdGetSize (PcdNvStoreDefaultValueBuffer);
> >
> > + gNvDefaultStoreSize = 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
^ permalink raw reply [flat|nested] 7+ messages in thread* 回复: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable
2022-01-17 1:13 ` Dandan Bi
@ 2022-01-17 3:11 ` gaoliming
2022-01-17 3:48 ` Dandan Bi
0 siblings, 1 reply; 7+ messages in thread
From: gaoliming @ 2022-01-17 3:11 UTC (permalink / raw)
To: devel, dandan.bi, 'Huang, Long1'
Cc: 'Feng, Bob C', 'Chen, Lin Z',
'Li, Zhuangzhi'
Dandan:
I will review this patch today. Please wait one day for me.
Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Dandan Bi
> 发送时间: 2022年1月17日 9:13
> 收件人: Huang, Long1 <long1.huang@intel.com>; devel@edk2.groups.io
> 抄送: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Chen, Lin Z <lin.z.chen@intel.com>; Li,
> Zhuangzhi <zhuangzhi.li@intel.com>
> 主题: Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabaseDxe: Add
> Support for authenticated variable
>
> I will push this patch today if no other comment.
>
>
> Thanks,
> Dandan
>
> > -----Original Message-----
> > From: Bi, Dandan
> > Sent: Thursday, January 13, 2022 1:35 PM
> > To: Huang, Long1 <long1.huang@intel.com>; devel@edk2.groups.io
> > Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming
> > <gaoliming@byosoft.com.cn>; Chen, Lin Z <lin.z.chen@intel.com>; Li,
> > Zhuangzhi <zhuangzhi.li@intel.com>
> > Subject: RE: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for
> > authenticated variable
> >
> > The change is ok to me. Reviewed-by: Dandan Bi <dandan.bi@intel.com>
> >
> > Hi Liming,
> >
> > Could you also help review it?
> >
> >
> > Thanks,
> > Dandan
> > > -----Original Message-----
> > > From: Huang, Long1 <long1.huang@intel.com>
> > > Sent: Thursday, January 13, 2022 1:06 AM
> > > To: devel@edk2.groups.io
> > > Cc: Huang, Long1 <long1.huang@intel.com>; Feng, Bob C
> > > <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Bi,
> > > Dandan <dandan.bi@intel.com>; Chen, Lin Z <lin.z.chen@intel.com>; Li,
> > > Zhuangzhi <zhuangzhi.li@intel.com>
> > > Subject: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for
> > > authenticated variable
> > >
> > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3796
> > >
> > > 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 <long1.huang@intel.com>
> > >
> > > Cc: Bob Feng <bob.c.feng@intel.com>
> > > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > > Cc: Dandan Bi <dandan.bi@intel.com>
> > > Cc: Lin Z Chen <lin.z.chen@intel.com>
> > > Cc: Zhuangzhi Li <zhuangzhi.li@intel.com>
> > > ---
> > > .../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 = (AUTHENTICATED_VARIABLE_HEADER
> *)((UINT8
> > > *)VariableStorage + VariableStorage->Size);
> > >
> > > + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER
> > > *)(VariableStorage + 1);
> > >
> > > + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER
> > > *)HEADER_ALIGN (AuthVariableHeader);
> > >
> > > + while (AuthVariableHeader < AuthVariableEnd) {
> > >
> > > + if (CompareGuid (&AuthVariableHeader->VendorGuid, VarGuid) &&
> > >
> > > + (AuthVariableHeader->Attributes == VarAttribute) &&
> > >
> > > + (StrCmp (VarName, (CHAR16 *)(AuthVariableHeader + 1)) ==
> 0))
> > >
> > > + {
> > >
> > > + return AuthVariableHeader;
> > >
> > > + }
> > >
> > > +
> > >
> > > + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER
> *)((UINT8
> > > *)AuthVariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER) +
> > > AuthVariableHeader->NameSize + AuthVariableHeader->DataSize);
> > >
> > > + AuthVariableHeader = (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 == 0xFFFFFFFFFFFFFFFF) {
> > >
> > > gSkuId = LibPcdGetSku ();
> > >
> > > @@ -666,7 +709,7 @@ FindQuestionDefaultSetting (
> > > }
> > >
> > >
> > >
> > > if (Link == &gVarStorageList) {
> > >
> > > - DataBuffer = (UINT8 *)PcdGetPtr
> (PcdNvStoreDefaultValueBuffer);
> > >
> > > + DataBuffer = (UINT8 *)PcdGetExPtr
> > > (&gEfiMdeModulePkgTokenSpaceGuid, PcdNvStoreDefaultValueBuffer);
> > >
> > > gNvDefaultStoreSize =
> ((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 = FALSE;
> > >
> > > + if (CompareGuid (&VariableStorage->Signature,
> > > &gEfiAuthenticatedVariableGuid)) {
> > >
> > > + AuthFormat = TRUE;
> > >
> > > + }
> > >
> > > +
> > >
> > > //
> > >
> > > // Find the question default value from the variable storage
> > >
> > > //
> > >
> > > - VariableHeader = FindVariableData (VariableStorage,
> > > &EfiVarStore->Guid,
> > > EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
> > >
> > > - if (VariableHeader == NULL) {
> > >
> > > - return EFI_NOT_FOUND;
> > >
> > > + if(AuthFormat) {
> > >
> > > + AuthVariableHeader = FindAuthVariableData (VariableStorage,
> > > &EfiVarStore->Guid, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore-
> > > >Name);
> > >
> > > + if (AuthVariableHeader == NULL) {
> > >
> > > + return EFI_NOT_FOUND;
> > >
> > > + }
> > >
> > > + } else {
> > >
> > > + VariableHeader = FindVariableData (VariableStorage,
> > > + &EfiVarStore->Guid,
> > > EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
> > >
> > > + if (VariableHeader == NULL) {
> > >
> > > + return EFI_NOT_FOUND;
> > >
> > > + }
> > >
> > > }
> > >
> > >
> > >
> > > StartBit = 0;
> > >
> > > @@ -770,8 +828,24 @@ FindQuestionDefaultSetting (
> > > Width = EndBit / 8 + 1;
> > >
> > > }
> > >
> > >
> > >
> > > - if (VariableHeader->DataSize < ByteOffset + Width) {
> > >
> > > - return EFI_INVALID_PARAMETER;
> > >
> > > + if (AuthFormat) {
> > >
> > > + if (AuthVariableHeader->DataSize < ByteOffset + Width) {
> > >
> > > + return EFI_INVALID_PARAMETER;
> > >
> > > + }
> > >
> > > +
> > >
> > > + ValueSource = (UINT8 *)AuthVariableHeader + sizeof
> > > (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize
> > +
> > > IfrQuestionHdr->VarStoreInfo.VarOffset;
> > >
> > > + if (BitFieldQuestion) {
> > >
> > > + BitValueSource = (UINT8 *)AuthVariableHeader + sizeof
> > > (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize
> > +
> > > ByteOffset;
> > >
> > > + }
> > >
> > > + } else {
> > >
> > > + if (VariableHeader->DataSize < ByteOffset + Width) {
> > >
> > > + return EFI_INVALID_PARAMETER;
> > >
> > > + }
> > >
> > > +
> > >
> > > + ValueSource = (UINT8 *)VariableHeader + sizeof
> (VARIABLE_HEADER)
> > > + +
> > > VariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset;
> > >
> > > + if (BitFieldQuestion) {
> > >
> > > + BitValueSource = (UINT8 *)VariableHeader + sizeof
> > > + (VARIABLE_HEADER)
> > > + VariableHeader->NameSize + ByteOffset;
> > >
> > > + }
> > >
> > > }
> > >
> > >
> > >
> > > //
> > >
> > > @@ -779,11 +853,11 @@ FindQuestionDefaultSetting (
> > > //
> > >
> > > if (ValueBuffer != NULL) {
> > >
> > > if (BitFieldQuestion) {
> > >
> > > - CopyMem (&BufferValue, (UINT8 *)VariableHeader + sizeof
> > > (VARIABLE_HEADER) + VariableHeader->NameSize + ByteOffset, Width);
> > >
> > > + CopyMem (&BufferValue, BitValueSource, Width);
> > >
> > > BitFieldVal = 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 == 0) {
> > >
> > > - gNvDefaultStoreSize = PcdGetSize (PcdNvStoreDefaultValueBuffer);
> > >
> > > + gNvDefaultStoreSize = 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
>
>
>
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable
2022-01-17 3:11 ` 回复: [edk2-devel] " gaoliming
@ 2022-01-17 3:48 ` Dandan Bi
0 siblings, 0 replies; 7+ messages in thread
From: Dandan Bi @ 2022-01-17 3:48 UTC (permalink / raw)
To: Gao, Liming, devel@edk2.groups.io, Huang, Long1
Cc: Feng, Bob C, Chen, Lin Z, Li, Zhuangzhi
Sure. Thanks Liming.
Thanks,
Dandan
> -----Original Message-----
> From: gaoliming <gaoliming@byosoft.com.cn>
> Sent: Monday, January 17, 2022 11:12 AM
> To: devel@edk2.groups.io; Bi, Dandan <dandan.bi@intel.com>; Huang,
> Long1 <long1.huang@intel.com>
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Chen, Lin Z <lin.z.chen@intel.com>;
> Li, Zhuangzhi <zhuangzhi.li@intel.com>
> Subject: 回复: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabaseDxe: Add
> Support for authenticated variable
>
> Dandan:
> I will review this patch today. Please wait one day for me.
>
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Dandan Bi
> > 发送时间: 2022年1月17日 9:13
> > 收件人: Huang, Long1 <long1.huang@intel.com>; devel@edk2.groups.io
> > 抄送: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming
> > <gaoliming@byosoft.com.cn>; Chen, Lin Z <lin.z.chen@intel.com>; Li,
> > Zhuangzhi <zhuangzhi.li@intel.com>
> > 主题: Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabaseDxe: Add
> Support
> > for authenticated variable
> >
> > I will push this patch today if no other comment.
> >
> >
> > Thanks,
> > Dandan
> >
> > > -----Original Message-----
> > > From: Bi, Dandan
> > > Sent: Thursday, January 13, 2022 1:35 PM
> > > To: Huang, Long1 <long1.huang@intel.com>; devel@edk2.groups.io
> > > Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming
> > > <gaoliming@byosoft.com.cn>; Chen, Lin Z <lin.z.chen@intel.com>; Li,
> > > Zhuangzhi <zhuangzhi.li@intel.com>
> > > Subject: RE: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for
> > > authenticated variable
> > >
> > > The change is ok to me. Reviewed-by: Dandan Bi <dandan.bi@intel.com>
> > >
> > > Hi Liming,
> > >
> > > Could you also help review it?
> > >
> > >
> > > Thanks,
> > > Dandan
> > > > -----Original Message-----
> > > > From: Huang, Long1 <long1.huang@intel.com>
> > > > Sent: Thursday, January 13, 2022 1:06 AM
> > > > To: devel@edk2.groups.io
> > > > Cc: Huang, Long1 <long1.huang@intel.com>; Feng, Bob C
> > > > <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>;
> > > > Bi, Dandan <dandan.bi@intel.com>; Chen, Lin Z
> > > > <lin.z.chen@intel.com>; Li, Zhuangzhi <zhuangzhi.li@intel.com>
> > > > Subject: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for
> > > > authenticated variable
> > > >
> > > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3796
> > > >
> > > > 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 <long1.huang@intel.com>
> > > >
> > > > Cc: Bob Feng <bob.c.feng@intel.com>
> > > > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > > > Cc: Dandan Bi <dandan.bi@intel.com>
> > > > Cc: Lin Z Chen <lin.z.chen@intel.com>
> > > > Cc: Zhuangzhi Li <zhuangzhi.li@intel.com>
> > > > ---
> > > > .../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 = (AUTHENTICATED_VARIABLE_HEADER
> > *)((UINT8
> > > > *)VariableStorage + VariableStorage->Size);
> > > >
> > > > + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER
> > > > *)(VariableStorage + 1);
> > > >
> > > > + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER
> > > > *)HEADER_ALIGN (AuthVariableHeader);
> > > >
> > > > + while (AuthVariableHeader < AuthVariableEnd) {
> > > >
> > > > + if (CompareGuid (&AuthVariableHeader->VendorGuid, VarGuid) &&
> > > >
> > > > + (AuthVariableHeader->Attributes == VarAttribute) &&
> > > >
> > > > + (StrCmp (VarName, (CHAR16 *)(AuthVariableHeader + 1)) ==
> > 0))
> > > >
> > > > + {
> > > >
> > > > + return AuthVariableHeader;
> > > >
> > > > + }
> > > >
> > > > +
> > > >
> > > > + AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER
> > *)((UINT8
> > > > *)AuthVariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER)
> +
> > > > AuthVariableHeader->NameSize + AuthVariableHeader->DataSize);
> > > >
> > > > + AuthVariableHeader = (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 == 0xFFFFFFFFFFFFFFFF) {
> > > >
> > > > gSkuId = LibPcdGetSku ();
> > > >
> > > > @@ -666,7 +709,7 @@ FindQuestionDefaultSetting (
> > > > }
> > > >
> > > >
> > > >
> > > > if (Link == &gVarStorageList) {
> > > >
> > > > - DataBuffer = (UINT8 *)PcdGetPtr
> > (PcdNvStoreDefaultValueBuffer);
> > > >
> > > > + DataBuffer = (UINT8 *)PcdGetExPtr
> > > > (&gEfiMdeModulePkgTokenSpaceGuid,
> PcdNvStoreDefaultValueBuffer);
> > > >
> > > > gNvDefaultStoreSize =
> > ((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 = FALSE;
> > > >
> > > > + if (CompareGuid (&VariableStorage->Signature,
> > > > &gEfiAuthenticatedVariableGuid)) {
> > > >
> > > > + AuthFormat = TRUE;
> > > >
> > > > + }
> > > >
> > > > +
> > > >
> > > > //
> > > >
> > > > // Find the question default value from the variable storage
> > > >
> > > > //
> > > >
> > > > - VariableHeader = FindVariableData (VariableStorage,
> > > > &EfiVarStore->Guid,
> > > > EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
> > > >
> > > > - if (VariableHeader == NULL) {
> > > >
> > > > - return EFI_NOT_FOUND;
> > > >
> > > > + if(AuthFormat) {
> > > >
> > > > + AuthVariableHeader = FindAuthVariableData (VariableStorage,
> > > > &EfiVarStore->Guid, EfiVarStore->Attributes, (CHAR16
> > > > *)EfiVarStore-
> > > > >Name);
> > > >
> > > > + if (AuthVariableHeader == NULL) {
> > > >
> > > > + return EFI_NOT_FOUND;
> > > >
> > > > + }
> > > >
> > > > + } else {
> > > >
> > > > + VariableHeader = FindVariableData (VariableStorage,
> > > > + &EfiVarStore->Guid,
> > > > EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
> > > >
> > > > + if (VariableHeader == NULL) {
> > > >
> > > > + return EFI_NOT_FOUND;
> > > >
> > > > + }
> > > >
> > > > }
> > > >
> > > >
> > > >
> > > > StartBit = 0;
> > > >
> > > > @@ -770,8 +828,24 @@ FindQuestionDefaultSetting (
> > > > Width = EndBit / 8 + 1;
> > > >
> > > > }
> > > >
> > > >
> > > >
> > > > - if (VariableHeader->DataSize < ByteOffset + Width) {
> > > >
> > > > - return EFI_INVALID_PARAMETER;
> > > >
> > > > + if (AuthFormat) {
> > > >
> > > > + if (AuthVariableHeader->DataSize < ByteOffset + Width) {
> > > >
> > > > + return EFI_INVALID_PARAMETER;
> > > >
> > > > + }
> > > >
> > > > +
> > > >
> > > > + ValueSource = (UINT8 *)AuthVariableHeader + sizeof
> > > > (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader-
> >NameSize
> > > +
> > > > IfrQuestionHdr->VarStoreInfo.VarOffset;
> > > >
> > > > + if (BitFieldQuestion) {
> > > >
> > > > + BitValueSource = (UINT8 *)AuthVariableHeader + sizeof
> > > > (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader-
> >NameSize
> > > +
> > > > ByteOffset;
> > > >
> > > > + }
> > > >
> > > > + } else {
> > > >
> > > > + if (VariableHeader->DataSize < ByteOffset + Width) {
> > > >
> > > > + return EFI_INVALID_PARAMETER;
> > > >
> > > > + }
> > > >
> > > > +
> > > >
> > > > + ValueSource = (UINT8 *)VariableHeader + sizeof
> > (VARIABLE_HEADER)
> > > > + +
> > > > VariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset;
> > > >
> > > > + if (BitFieldQuestion) {
> > > >
> > > > + BitValueSource = (UINT8 *)VariableHeader + sizeof
> > > > + (VARIABLE_HEADER)
> > > > + VariableHeader->NameSize + ByteOffset;
> > > >
> > > > + }
> > > >
> > > > }
> > > >
> > > >
> > > >
> > > > //
> > > >
> > > > @@ -779,11 +853,11 @@ FindQuestionDefaultSetting (
> > > > //
> > > >
> > > > if (ValueBuffer != NULL) {
> > > >
> > > > if (BitFieldQuestion) {
> > > >
> > > > - CopyMem (&BufferValue, (UINT8 *)VariableHeader + sizeof
> > > > (VARIABLE_HEADER) + VariableHeader->NameSize + ByteOffset,
> Width);
> > > >
> > > > + CopyMem (&BufferValue, BitValueSource, Width);
> > > >
> > > > BitFieldVal = 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 == 0) {
> > > >
> > > > - gNvDefaultStoreSize = PcdGetSize (PcdNvStoreDefaultValueBuffer);
> > > >
> > > > + gNvDefaultStoreSize = 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
> >
> >
> >
> >
> >
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable
2022-01-12 17:06 [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable Long1 Huang
2022-01-13 5:34 ` Dandan Bi
@ 2022-01-19 1:59 ` Ni, Ray
1 sibling, 0 replies; 7+ messages in thread
From: Ni, Ray @ 2022-01-19 1:59 UTC (permalink / raw)
To: devel@edk2.groups.io, Huang, Long1
Cc: Feng, Bob C, Gao, Liming, Bi, Dandan, Chen, Lin Z, Li, Zhuangzhi
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Long1 Huang
Sent: Thursday, January 13, 2022 1:06 AM
To: devel@edk2.groups.io
Cc: Huang, Long1 <long1.huang@intel.com>; Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Bi, Dandan <dandan.bi@intel.com>; Chen, Lin Z <lin.z.chen@intel.com>; Li, Zhuangzhi <zhuangzhi.li@intel.com>
Subject: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3796
Database.c:
1. Replace PcdGetExPtr with PcdGetExPtr.
What does above mean? Replace <a> with <a>?
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable
@ 2022-01-10 17:02 Long1 Huang
0 siblings, 0 replies; 7+ messages in thread
From: Long1 Huang @ 2022-01-10 17:02 UTC (permalink / raw)
To: devel; +Cc: Huang Long, Liming Gao, Chen Lin Z, Dandan Bi
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3796
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 <gaoliming@byosoft.com.cn>
Cc: Chen Lin Z <lin.z.chen@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Signed-off-by: Huang Long <long1.huang@intel.com>
---
.../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/MdeModulePkg/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;
}
+/**
+ 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 = (AUTHENTICATED_VARIABLE_HEADER *)((UINT8 *)VariableStorage + VariableStorage->Size);
+ AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER *)(VariableStorage + 1);
+ AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER *)HEADER_ALIGN (AuthVariableHeader);
+ while (AuthVariableHeader < AuthVariableEnd) {
+ if (CompareGuid (&AuthVariableHeader->VendorGuid, VarGuid) &&
+ (AuthVariableHeader->Attributes == VarAttribute) &&
+ (StrCmp (VarName, (CHAR16 *)(AuthVariableHeader + 1)) == 0))
+ {
+ return AuthVariableHeader;
+ }
+
+ AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER *)((UINT8 *)AuthVariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize + AuthVariableHeader->DataSize);
+ AuthVariableHeader = (AUTHENTICATED_VARIABLE_HEADER *)HEADER_ALIGN (AuthVariableHeader);
+ }
+
+ return NULL;
+}
+
/**
Find question default value from PcdNvStoreDefaultValueBuffer
@@ -626,25 +665,27 @@ 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;
+ 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 == 0xFFFFFFFFFFFFFFFF) {
gSkuId = LibPcdGetSku ();
@@ -666,7 +707,7 @@ FindQuestionDefaultSetting (
}
if (Link == &gVarStorageList) {
- DataBuffer = (UINT8 *)PcdGetPtr (PcdNvStoreDefaultValueBuffer);
+ DataBuffer = (UINT8 *)PcdGetExPtr (&gEfiMdeModulePkgTokenSpaceGuid, PcdNvStoreDefaultValueBuffer);
gNvDefaultStoreSize = ((PCD_NV_STORE_DEFAULT_BUFFER_HEADER *)DataBuffer)->Length;
//
// The first section data includes NV storage default setting.
@@ -750,12 +791,27 @@ FindQuestionDefaultSetting (
return EFI_NOT_FOUND;
}
+ //
+ // Judge if the variable type is authenticated, default is false
+ //
+ AuthFormat = FALSE;
+ if (CompareGuid (&VariableStorage->Signature, &gEfiAuthenticatedVariableGuid)) {
+ AuthFormat = TRUE;
+ }
+
//
// Find the question default value from the variable storage
//
- VariableHeader = FindVariableData (VariableStorage, &EfiVarStore->Guid, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
- if (VariableHeader == NULL) {
- return EFI_NOT_FOUND;
+ if(AuthFormat) {
+ AuthVariableHeader = FindAuthVariableData (VariableStorage, &EfiVarStore->Guid, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
+ if (AuthVariableHeader == NULL) {
+ return EFI_NOT_FOUND;
+ }
+ } else {
+ VariableHeader = FindVariableData (VariableStorage, &EfiVarStore->Guid, EfiVarStore->Attributes, (CHAR16 *)EfiVarStore->Name);
+ if (VariableHeader == NULL) {
+ return EFI_NOT_FOUND;
+ }
}
StartBit = 0;
@@ -770,20 +826,39 @@ FindQuestionDefaultSetting (
Width = EndBit / 8 + 1;
}
- if (VariableHeader->DataSize < ByteOffset + Width) {
- return EFI_INVALID_PARAMETER;
- }
+ if(AuthFormat) {
+ if (AuthVariableHeader->DataSize < ByteOffset + Width) {
+ return EFI_INVALID_PARAMETER;
+ }
- //
- // Copy the question value
- //
- if (ValueBuffer != NULL) {
- if (BitFieldQuestion) {
- CopyMem (&BufferValue, (UINT8 *)VariableHeader + sizeof (VARIABLE_HEADER) + VariableHeader->NameSize + ByteOffset, Width);
- BitFieldVal = BitFieldRead32 (BufferValue, StartBit, EndBit);
- CopyMem (ValueBuffer, &BitFieldVal, Width);
- } else {
- CopyMem (ValueBuffer, (UINT8 *)VariableHeader + sizeof (VARIABLE_HEADER) + VariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset, Width);
+ //
+ // Copy the question value
+ //
+ if (ValueBuffer != NULL) {
+ if (BitFieldQuestion) {
+ CopyMem (&BufferValue, (UINT8 *)AuthVariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize + ByteOffset, Width);
+ BitFieldVal = BitFieldRead32 (BufferValue, StartBit, EndBit);
+ CopyMem (ValueBuffer, &BitFieldVal, Width);
+ } else {
+ CopyMem (ValueBuffer, (UINT8 *)AuthVariableHeader + sizeof (AUTHENTICATED_VARIABLE_HEADER) + AuthVariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset, Width);
+ }
+ }
+ } else {
+ if (VariableHeader->DataSize < ByteOffset + Width) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ //
+ // Copy the question value
+ //
+ if (ValueBuffer != NULL) {
+ if (BitFieldQuestion) {
+ CopyMem (&BufferValue, (UINT8 *)VariableHeader + sizeof (VARIABLE_HEADER) + VariableHeader->NameSize + ByteOffset, Width);
+ BitFieldVal = BitFieldRead32 (BufferValue, StartBit, EndBit);
+ CopyMem (ValueBuffer, &BitFieldVal, Width);
+ } else {
+ CopyMem (ValueBuffer, (UINT8 *)VariableHeader + sizeof (VARIABLE_HEADER) + VariableHeader->NameSize + IfrQuestionHdr->VarStoreInfo.VarOffset, Width);
+ }
}
}
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-01-19 1:59 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-12 17:06 [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable Long1 Huang
2022-01-13 5:34 ` Dandan Bi
2022-01-17 1:13 ` Dandan Bi
2022-01-17 3:11 ` 回复: [edk2-devel] " gaoliming
2022-01-17 3:48 ` Dandan Bi
2022-01-19 1:59 ` Ni, Ray
-- strict thread matches above, loose matches on Subject: below --
2022-01-10 17:02 Long1 Huang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox