mirror of https://github.com/acidanthera/audk.git
Check the input VaraibleName for db/dbx when appending variables with formatted as EFI_SIGNATURE_LIST.
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com> Reviewed-by: Ye Ting <ting.ye@intel.com> Reviewed-by: Dong Guo <guo.dong@intel.com> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14087 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
12cbe23257
commit
5767f22fca
|
@ -1820,11 +1820,11 @@ UpdateVariable (
|
||||||
DataOffset = sizeof (VARIABLE_HEADER) + Variable->CurrPtr->NameSize + GET_PAD_SIZE (Variable->CurrPtr->NameSize);
|
DataOffset = sizeof (VARIABLE_HEADER) + Variable->CurrPtr->NameSize + GET_PAD_SIZE (Variable->CurrPtr->NameSize);
|
||||||
CopyMem (mStorageArea, (UINT8*)((UINTN) Variable->CurrPtr + DataOffset), Variable->CurrPtr->DataSize);
|
CopyMem (mStorageArea, (UINT8*)((UINTN) Variable->CurrPtr + DataOffset), Variable->CurrPtr->DataSize);
|
||||||
|
|
||||||
if (CompareGuid (VendorGuid, &gEfiImageSecurityDatabaseGuid) ||
|
if ((CompareGuid (VendorGuid, &gEfiImageSecurityDatabaseGuid) &&
|
||||||
(CompareGuid (VendorGuid, &gEfiGlobalVariableGuid) && (StrCmp (VariableName, EFI_KEY_EXCHANGE_KEY_NAME) == 0))) {
|
((StrCmp (VariableName, EFI_IMAGE_SECURITY_DATABASE) == 0) || (StrCmp (VariableName, EFI_IMAGE_SECURITY_DATABASE1) == 0))) ||
|
||||||
|
(CompareGuid (VendorGuid, &gEfiGlobalVariableGuid) && (StrCmp (VariableName, EFI_KEY_EXCHANGE_KEY_NAME) == 0))) {
|
||||||
//
|
//
|
||||||
// For variables with the GUID EFI_IMAGE_SECURITY_DATABASE_GUID (i.e. where the data
|
// For variables with formatted as EFI_SIGNATURE_LIST, the driver shall not perform an append of
|
||||||
// buffer is formatted as EFI_SIGNATURE_LIST), the driver shall not perform an append of
|
|
||||||
// EFI_SIGNATURE_DATA values that are already part of the existing variable value.
|
// EFI_SIGNATURE_DATA values that are already part of the existing variable value.
|
||||||
//
|
//
|
||||||
BufSize = AppendSignatureList (mStorageArea, Variable->CurrPtr->DataSize, Data, DataSize);
|
BufSize = AppendSignatureList (mStorageArea, Variable->CurrPtr->DataSize, Data, DataSize);
|
||||||
|
|
Loading…
Reference in New Issue