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

SecurityPkg/SecureBootConfigDxe: Handle allocation failure gracefully 

The function AllocateCopyPool may return NULL, so need to do check
after calling it. This patch is to enhance the related logic.

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Qiu Shumin <shumin.qiu@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
This commit is contained in:
Dandan Bi 2016-02-29 14:37:07 +08:00 committed by Feng Tian
parent f5c12172f1
commit ed2992b3f7
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigFileExplorer.c
View File

@ -222,11 +222,13 @@ OpenFileByDevicePath(
/** /**
Extract filename from device path. The returned buffer is allocated using AllocateCopyPool. Extract filename from device path. The returned buffer is allocated using AllocateCopyPool.
The caller is responsible for freeing the allocated buffer using FreePool(). The caller is responsible for freeing the allocated buffer using FreePool(). If return NULL
means not enough memory resource.
@param DevicePath Device path. @param DevicePath Device path.
@return A new allocated string that represents the file name. @retval NULL Not enough memory resourece for AllocateCopyPool.
@retval Other A new allocated string that represents the file name.
**/ **/
CHAR16 * CHAR16 *
@ -245,6 +247,7 @@ ExtractFileNameFromDevicePath (
String = DevicePathToStr(DevicePath); String = DevicePathToStr(DevicePath);
MatchString = String; MatchString = String;
LastMatch = String; LastMatch = String;
FileName = NULL;
while(MatchString != NULL){ while(MatchString != NULL){
LastMatch = MatchString + 1; LastMatch = MatchString + 1;
@ -253,7 +256,9 @@ ExtractFileNameFromDevicePath (
Length = StrLen(LastMatch); Length = StrLen(LastMatch);
FileName = AllocateCopyPool ((Length + 1) * sizeof(CHAR16), LastMatch); FileName = AllocateCopyPool ((Length + 1) * sizeof(CHAR16), LastMatch);
if (FileName != NULL) {
*(FileName + Length) = 0; *(FileName + Length) = 0;
}
FreePool(String); FreePool(String);
@ -280,14 +285,21 @@ UpdatePage(
CHAR16 *FileName; CHAR16 *FileName;
EFI_STRING_ID StringToken; EFI_STRING_ID StringToken;
if (FilePath != NULL){ FileName = NULL;
if (FilePath != NULL) {
FileName = ExtractFileNameFromDevicePath(FilePath); FileName = ExtractFileNameFromDevicePath(FilePath);
StringToken = HiiSetString (gSecureBootPrivateData->HiiHandle, 0, FileName, NULL);
} else {
FileName = HiiGetString (gSecureBootPrivateData->HiiHandle, STRING_TOKEN (STR_NULL), NULL);
ASSERT (FileName != NULL);
StringToken = HiiSetString (gSecureBootPrivateData->HiiHandle, 0, FileName, NULL);
} }
if (FileName == NULL) {
//
// FileName = NULL has two case:
// 1. FilePath == NULL, not select file.
// 2. FilePath != NULL, but ExtractFileNameFromDevicePath return NULL not enough memory resource.
// In these two case, no need to update the form, and exit the caller function.
//
return TRUE;
}
StringToken = HiiSetString (gSecureBootPrivateData->HiiHandle, 0, FileName, NULL);
gSecureBootPrivateData->FileContext->FileName = FileName; gSecureBootPrivateData->FileContext->FileName = FileName;