Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MdeModulePkg/Variable/RuntimeDxe: Fix return status from Reclaim() 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2844

Update Reclaim() to return the error status from the reclaim
operation and not the status of SynchronizeRuntimeVariableCache()
that can be EFI_SUCCESS even through the status from reclaim
is an error.  Without this change, the return status from
SetVariable() can be EFI_SUCCESS even though the variable was
not actually set.  This occurs if the variable store is full
and a Reclaim() is invoked to free up space and even after all
possible space is freed, there is still not enough room for
the variable being set.  This condition should return
EFI_OUT_OF_RESOURCES.

Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
This commit is contained in:
Michael D Kinney 2020-07-09 19:41:15 -07:00 committed by mergify[bot]
parent 9c6f3545ae
commit 256c4470f8
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,6 +531,7 @@ Reclaim (
VOID *Point1; VOID *Point1;
BOOLEAN FoundAdded; BOOLEAN FoundAdded;
EFI_STATUS Status; EFI_STATUS Status;
EFI_STATUS DoneStatus;
UINTN CommonVariableTotalSize; UINTN CommonVariableTotalSize;
UINTN CommonUserVariableTotalSize; UINTN CommonUserVariableTotalSize;
UINTN HwErrVariableTotalSize; UINTN HwErrVariableTotalSize;
@ -774,25 +775,30 @@ Reclaim (
} }
Done: Done:
DoneStatus = EFI_SUCCESS;
if (IsVolatile || mVariableModuleGlobal->VariableGlobal.EmuNvMode) { if (IsVolatile || mVariableModuleGlobal->VariableGlobal.EmuNvMode) {
Status = SynchronizeRuntimeVariableCache ( DoneStatus = SynchronizeRuntimeVariableCache (
&mVariableModuleGlobal->VariableGlobal.VariableRuntimeCacheContext.VariableRuntimeVolatileCache, &mVariableModuleGlobal->VariableGlobal.VariableRuntimeCacheContext.VariableRuntimeVolatileCache,
0, 0,
VariableStoreHeader->Size VariableStoreHeader->Size
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (DoneStatus);
FreePool (ValidBuffer); FreePool (ValidBuffer);
} else { } else {
// //
// For NV variable reclaim, we use mNvVariableCache as the buffer, so copy the data back. // For NV variable reclaim, we use mNvVariableCache as the buffer, so copy the data back.
// //
CopyMem (mNvVariableCache, (UINT8 *) (UINTN) VariableBase, VariableStoreHeader->Size); CopyMem (mNvVariableCache, (UINT8 *) (UINTN) VariableBase, VariableStoreHeader->Size);
Status = SynchronizeRuntimeVariableCache ( DoneStatus = SynchronizeRuntimeVariableCache (
&mVariableModuleGlobal->VariableGlobal.VariableRuntimeCacheContext.VariableRuntimeNvCache, &mVariableModuleGlobal->VariableGlobal.VariableRuntimeCacheContext.VariableRuntimeNvCache,
0, 0,
VariableStoreHeader->Size VariableStoreHeader->Size
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (DoneStatus);
}
if (!EFI_ERROR (Status) && EFI_ERROR (DoneStatus)) {
Status = DoneStatus;
} }
return Status; return Status;