sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Align the header of variable from 1 to 4, which can avoid the size of variable content corrupt if the critical data cross two flash block.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4543 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
yshang1
2008-01-10 04:26:13 +00:00
parent fdb7765f2d
commit 9cad030bc1
7 changed files with 229 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
View File

@ -80,6 +80,59 @@ Returns:
}
UINT32
NameSizeOfVariable (
IN VARIABLE_HEADER *Variable
)
{
//
// Check whether the header is valid fully;
// Tricky: The unprogramed data in FLASH equals 0xff.
//
if (Variable->DataSize == (UINT32) -1 ||
Variable->Attributes == (UINT32) -1 ||
Variable->NameSize == (UINT32) -1) {
return 0;
}
return Variable->NameSize;
}
UINT32
DataSizeOfVariable (
IN VARIABLE_HEADER *Variable
)
{
//
// Check whether the header is valid fully;
// Tricky: The unprogramed data in FLASH equals 0xff.
//
if (Variable->DataSize == (UINT32) -1 ||
Variable->Attributes == (UINT32) -1 ||
Variable->NameSize == (UINT32) -1) {
return 0;
}
return Variable->DataSize;
}
UINT32
AttributesOfVariable (
IN VARIABLE_HEADER *Variable
)
{
//
// Check whether the header is valid fully;
// Tricky: The unprogramed data in FLASH equals 0xff.
//
if (Variable->DataSize == (UINT32) -1 ||
Variable->Attributes == (UINT32) -1 ||
Variable->NameSize == (UINT32) -1) {
return 0;
}
return Variable->Attributes;
}
STATIC
VARIABLE_HEADER *
GetNextVariablePtr (
@ -100,7 +153,7 @@ Returns:
--*/
{
return (VARIABLE_HEADER *) ((UINTN) GET_VARIABLE_DATA_PTR (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));
return (VARIABLE_HEADER *) HEADER_ALIGN ((UINTN) GET_VARIABLE_DATA_PTR (Variable) + DataSizeOfVariable (Variable) + GET_PAD_SIZE (DataSizeOfVariable (Variable)));
}
STATIC
@ -124,10 +177,7 @@ Returns:
--*/
{
if (Variable == NULL ||
Variable->StartId != VARIABLE_DATA ||
(sizeof (VARIABLE_HEADER) + Variable->DataSize + Variable->NameSize) > MAX_VARIABLE_SIZE
) {
if (Variable == NULL || Variable->StartId != VARIABLE_DATA ) {
return FALSE;
}
@ -221,7 +271,8 @@ Returns:
(((INT32 *) VendorGuid)[2] == ((INT32 *) &Variable->VendorGuid)[2]) &&
(((INT32 *) VendorGuid)[3] == ((INT32 *) &Variable->VendorGuid)[3])
) {
if (!CompareMem (VariableName, GET_VARIABLE_NAME_PTR (Variable), Variable->NameSize)) {
ASSERT (NameSizeOfVariable (Variable) != 0);
if (!CompareMem (VariableName, GET_VARIABLE_NAME_PTR (Variable), NameSizeOfVariable (Variable))) {
PtrTrack->CurrPtr = Variable;
return EFI_SUCCESS;
}
@ -290,7 +341,6 @@ Returns:
for (Count = 0; Count < IndexTable->Length; Count++)
{
MaxIndex = GetVariableByIndex (IndexTable, Count);
if (CompareWithValidVariable (MaxIndex, VariableName, VendorGuid, PtrTrack) == EFI_SUCCESS) {
PtrTrack->StartPtr = IndexTable->StartPtr;
PtrTrack->EndPtr = IndexTable->EndPtr;
@ -429,7 +479,7 @@ Returns:
//
// Get data size
//
VarDataSize = Variable.CurrPtr->DataSize;
VarDataSize = DataSizeOfVariable (Variable.CurrPtr);
if (*DataSize >= VarDataSize) {
(*PeiServices)->CopyMem (Data, GET_VARIABLE_DATA_PTR (Variable.CurrPtr), VarDataSize);
@ -555,7 +605,9 @@ Returns:
while (!(Variable.CurrPtr >= Variable.EndPtr || Variable.CurrPtr == NULL)) {
if (IsValidVariableHeader (Variable.CurrPtr)) {
if (Variable.CurrPtr->State == VAR_ADDED) {
VarNameSize = (UINTN) Variable.CurrPtr->NameSize;
ASSERT (NameSizeOfVariable (Variable.CurrPtr) != 0);
VarNameSize = (UINTN) NameSizeOfVariable (Variable.CurrPtr);
if (VarNameSize <= *VariableNameSize) {
(*PeiServices)->CopyMem (VariableName, GET_VARIABLE_NAME_PTR (Variable.CurrPtr), VarNameSize);