tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a potential bug that SetVariable is invoked for NV variable prior to the installation of EFI_VARIABLE_WRITE_ARCH_PROTOCOL. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11190 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
gdong1 2010-12-22 07:33:13 +00:00
parent d766b22843
commit 5456306fcf
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
View File

@ -1363,34 +1363,33 @@ UpdateVariable (
VARIABLE_STORE_HEADER *VariableStoreHeader;
UINTN CacheOffset;
if (CacheVariable->Volatile) {
if ((mVariableModuleGlobal->FvbInstance == NULL) && ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0)) {
//
// The FVB protocol is not ready. Trying to update NV variable prior to the installation
// of EFI_VARIABLE_WRITE_ARCH_PROTOCOL.
//
return EFI_NOT_AVAILABLE_YET;
}
if ((CacheVariable->CurrPtr == NULL) || CacheVariable->Volatile) {
Variable = CacheVariable;
} else {
if (mVariableModuleGlobal->FvbInstance == NULL) {
//
// Trying to update NV variable prior to the installation of EFI_VARIABLE_WRITE_ARCH_PROTOCOL
//
return EFI_NOT_AVAILABLE_YET;
}
//
// Update/Delete existing NV variable.
// CacheVariable points to the variable in the memory copy of Flash area
// Now let Variable points to the same variable in Flash area.
//
ASSERT ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0);
VariableStoreHeader = (VARIABLE_STORE_HEADER *) ((UINTN) mVariableModuleGlobal->VariableGlobal.NonVolatileVariableBase);
Variable = &NvVariable;
Variable->StartPtr = GetStartPointer (VariableStoreHeader);
Variable->EndPtr = GetEndPointer (VariableStoreHeader);
if (CacheVariable->CurrPtr == NULL) {
Variable->CurrPtr = NULL;
} else {
Variable->CurrPtr = (VARIABLE_HEADER *)((UINTN)Variable->StartPtr + ((UINTN)CacheVariable->CurrPtr - (UINTN)CacheVariable->StartPtr));
}
Variable->Volatile = FALSE;
}
Fvb = mVariableModuleGlobal->FvbInstance;
Reclaimed = FALSE;
Variable->CurrPtr = (VARIABLE_HEADER *)((UINTN)Variable->StartPtr + ((UINTN)CacheVariable->CurrPtr - (UINTN)CacheVariable->StartPtr));
Variable->Volatile = FALSE;
}
Fvb = mVariableModuleGlobal->FvbInstance;
Reclaimed = FALSE;
if (Variable->CurrPtr != NULL) {
//