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

MdeModulePkg VarCheckLib: R18611 was thoughtless for property set 

R18611 only updated the logic to return correct property
when no property set to variable with wildcard name.
But VariablePropertySet needs the pointer of property data for set.
So roll back the change in VariablePropertyGetWithWildcardName at R18611,
and check the property revision first in VariablePropertyGet and
SetVariableCheck before using the property data.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18626 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Star Zeng 2015-10-19 06:41:28 +00:00 committed by lzeng14
parent 3a2e6a740d
commit d2dbe5b70b
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
MdeModulePkg/Library/VarCheckLib/VarCheckLib.c
View File

@ -141,19 +141,11 @@ VariablePropertyGetWithWildcardName (
VarCheckInternalIsHexaDecimalDigitCharacter (VariableName[NameLength + 1]) &&
VarCheckInternalIsHexaDecimalDigitCharacter (VariableName[NameLength + 2]) &&
VarCheckInternalIsHexaDecimalDigitCharacter (VariableName[NameLength + 3])) {
if (mVarCheckVariableWithWildcardName[Index].VariableProperty.Revision != VAR_CHECK_VARIABLE_PROPERTY_REVISION) {
return NULL;
} else {
return &mVarCheckVariableWithWildcardName[Index].VariableProperty;
}
return &mVarCheckVariableWithWildcardName[Index].VariableProperty;
}
}
if (StrCmp (mVarCheckVariableWithWildcardName[Index].Name, VariableName) == 0) {
if (mVarCheckVariableWithWildcardName[Index].VariableProperty.Revision != VAR_CHECK_VARIABLE_PROPERTY_REVISION) {
return NULL;
} else {
return &mVarCheckVariableWithWildcardName[Index].VariableProperty;
}
return &mVarCheckVariableWithWildcardName[Index].VariableProperty;
}
}
}
@ -512,6 +504,9 @@ VarCheckLibVariablePropertySet (
Status = EFI_SUCCESS;
//
// Get the pointer of property data for set.
//
Property = VariablePropertyGetFunction (Name, Guid, FALSE);
if (Property != NULL) {
CopyMem (Property, VariableProperty, sizeof (*VariableProperty));
@ -571,7 +566,12 @@ VarCheckLibVariablePropertyGet (
}
Property = VariablePropertyGetFunction (Name, Guid, TRUE);
if (Property != NULL) {
//
// Also check the property revision before using the property data.
// There is no property set to this variable(wildcard name)
// if the revision is not VAR_CHECK_VARIABLE_PROPERTY_REVISION.
//
if ((Property != NULL) && (Property->Revision == VAR_CHECK_VARIABLE_PROPERTY_REVISION)) {
CopyMem (VariableProperty, Property, sizeof (*VariableProperty));
return EFI_SUCCESS;
}
@ -619,7 +619,12 @@ VarCheckLibSetVariableCheck (
}
Property = VariablePropertyGetFunction (VariableName, VendorGuid, TRUE);
if (Property != NULL) {
//
// Also check the property revision before using the property data.
// There is no property set to this variable(wildcard name)
// if the revision is not VAR_CHECK_VARIABLE_PROPERTY_REVISION.
//
if ((Property != NULL) && (Property->Revision == VAR_CHECK_VARIABLE_PROPERTY_REVISION)) {
if ((RequestSource != VarCheckFromTrusted) && ((Property->Property & VAR_CHECK_VARIABLE_PROPERTY_READ_ONLY) != 0)) {
DEBUG ((EFI_D_INFO, "Variable Check ReadOnly variable fail %r - %g:%s\n", EFI_WRITE_PROTECTED, VendorGuid, VariableName));
return EFI_WRITE_PROTECTED;