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

Refine logic about validate boot option. 

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13362 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10 2012-05-25 05:04:13 +00:00
parent 097e8d6839
commit 3e8670718d
1 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
View File

@ -455,7 +455,7 @@ GetDevicePathSizeEx (
bigger than MaxStringLen, return length 0 to indicate that this is an bigger than MaxStringLen, return length 0 to indicate that this is an
invalidate string. invalidate string.
This function returns the number of Unicode characters in the Null-terminated This function returns the byte length of Unicode characters in the Null-terminated
Unicode string specified by String. Unicode string specified by String.
If String is NULL, then ASSERT(). If String is NULL, then ASSERT().
@ -479,13 +479,13 @@ StrSizeEx (
ASSERT (String != NULL && MaxStringLen != 0); ASSERT (String != NULL && MaxStringLen != 0);
ASSERT (((UINTN) String & BIT0) == 0); ASSERT (((UINTN) String & BIT0) == 0);
for (Length = 0; *String != L'\0' && MaxStringLen != Length; String++, Length++); for (Length = 0; *String != L'\0' && MaxStringLen != Length; String++, Length+=2);
if (*String != L'\0' && MaxStringLen == Length) { if (*String != L'\0' && MaxStringLen == Length) {
return 0; return 0;
} }
return (Length + 1) * sizeof (*String); return Length + 2;
} }
/** /**
@ -507,9 +507,12 @@ ValidateOption (
UINT16 FilePathSize; UINT16 FilePathSize;
UINT8 *TempPtr; UINT8 *TempPtr;
EFI_DEVICE_PATH_PROTOCOL *DevicePath; EFI_DEVICE_PATH_PROTOCOL *DevicePath;
EFI_DEVICE_PATH_PROTOCOL *TempPath;
UINTN TempSize; UINTN TempSize;
if (VariableSize <= sizeof (UINT16) + sizeof (UINT32)) {
return FALSE;
}
// //
// Skip the option attribute // Skip the option attribute
// //
@ -525,14 +528,14 @@ ValidateOption (
// //
// Get the option's description string size // Get the option's description string size
// //
TempSize = StrSizeEx ((CHAR16 *) TempPtr, VariableSize); TempSize = StrSizeEx ((CHAR16 *) TempPtr, VariableSize - sizeof (UINT16) - sizeof (UINT32));
TempPtr += TempSize; TempPtr += TempSize;
// //
// Get the option's device path // Get the option's device path
// //
DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) TempPtr; DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) TempPtr;
TempPtr += FilePathSize; TempPtr += FilePathSize;
// //
// Validation boot option variable. // Validation boot option variable.
@ -541,21 +544,11 @@ ValidateOption (
return FALSE; return FALSE;
} }
if (TempSize + FilePathSize + sizeof (UINT16) + sizeof (UINT16) > VariableSize) { if (TempSize + FilePathSize + sizeof (UINT16) + sizeof (UINT32) > VariableSize) {
return FALSE; return FALSE;
} }
TempPath = DevicePath; return GetDevicePathSizeEx (DevicePath, FilePathSize) != 0;
while (FilePathSize > 0) {
TempSize = GetDevicePathSizeEx (TempPath, FilePathSize);
if (TempSize == 0) {
return FALSE;
}
FilePathSize = (UINT16) (FilePathSize - TempSize);
TempPath += TempSize;
}
return TRUE;
} }
/** /**
@ -608,13 +601,12 @@ BdsLibVariableToOption (
UINT8 *TempPtr; UINT8 *TempPtr;
UINTN VariableSize; UINTN VariableSize;
EFI_DEVICE_PATH_PROTOCOL *DevicePath; EFI_DEVICE_PATH_PROTOCOL *DevicePath;
EFI_DEVICE_PATH_PROTOCOL *TempPath;
BDS_COMMON_OPTION *Option; BDS_COMMON_OPTION *Option;
VOID *LoadOptions; VOID *LoadOptions;
UINT32 LoadOptionsSize; UINT32 LoadOptionsSize;
CHAR16 *Description; CHAR16 *Description;
UINT8 NumOff; UINT8 NumOff;
UINTN TempSize;
// //
// Read the variable. We will never free this data. // Read the variable. We will never free this data.
// //
@ -659,11 +651,7 @@ BdsLibVariableToOption (
// //
// Get the option's description string size // Get the option's description string size
// //
TempSize = StrSizeEx ((CHAR16 *) TempPtr, VariableSize); TempPtr += StrSize((CHAR16 *) TempPtr);
if (TempSize == 0) {
return NULL;
}
TempPtr += TempSize;
// //
// Get the option's device path // Get the option's device path
@ -671,26 +659,10 @@ BdsLibVariableToOption (
DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) TempPtr; DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) TempPtr;
TempPtr += FilePathSize; TempPtr += FilePathSize;
//
// Validation device path.
//
TempPath = DevicePath;
while (FilePathSize > 0) {
TempSize = GetDevicePathSizeEx (TempPath, FilePathSize);
if (TempSize == 0) {
return NULL;
}
FilePathSize = (UINT16) (FilePathSize - TempSize);
TempPath += TempSize;
}
// //
// Get load opion data. // Get load opion data.
// //
LoadOptions = TempPtr; LoadOptions = TempPtr;
if (VariableSize < (UINTN)(TempPtr - Variable)) {
return NULL;
}
LoadOptionsSize = (UINT32) (VariableSize - (UINTN) (TempPtr - Variable)); LoadOptionsSize = (UINT32) (VariableSize - (UINTN) (TempPtr - Variable));
// //