tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-23 05:34:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/CapsuleApp: Fix memory leak issue.

Browse Source 
This issue is caused by FileInfoBuffer variable. This is a pointer array
and each elements also pointer to a memory buffer that is allocated and
returned by AllocateCopyPool function.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Zhang Chao B <chao.b.zhang@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
This commit is contained in:
Chen A Chen 2019-02-11 13:42:19 +08:00 committed by Liming Gao
parent da06a2a2fa
commit 325ad62260
1 changed files with 60 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
View File

@ -806,48 +806,69 @@ DumpCapsuleFromDisk (
Status = Fs->OpenVolume (Fs, &Root); Status = Fs->OpenVolume (Fs, &Root);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
Print (L"Cannot open volume. Status = %r\n", Status); Print (L"Cannot open volume. Status = %r\n", Status);
return EFI_NOT_FOUND; goto Done;
} }
Status = Root->Open (Root, &DirHandle, EFI_CAPSULE_FILE_DIRECTORY, EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE , 0); Status = Root->Open (Root, &DirHandle, EFI_CAPSULE_FILE_DIRECTORY, EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE , 0);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
Print (L"Cannot open %s. Status = %r\n", EFI_CAPSULE_FILE_DIRECTORY, Status); Print (L"Cannot open %s. Status = %r\n", EFI_CAPSULE_FILE_DIRECTORY, Status);
return EFI_NOT_FOUND; goto Done;
} }
// //
// Get file count first // Get file count first
// //
for ( Status = FileHandleFindFirstFile (DirHandle, &FileInfo) do {
; !EFI_ERROR(Status) && !NoFile Status = FileHandleFindFirstFile (DirHandle, &FileInfo);
; Status = FileHandleFindNextFile (DirHandle, FileInfo, &NoFile) if (EFI_ERROR (Status) || FileInfo == NULL) {
){ Print (L"Get File Info Fail. Status = %r\n", Status);
if ((FileInfo->Attribute & (EFI_FILE_SYSTEM | EFI_FILE_ARCHIVE)) == 0) { goto Done;
continue;
} }
FileCount++;
} if ((FileInfo->Attribute & (EFI_FILE_SYSTEM | EFI_FILE_ARCHIVE)) != 0) {
FileCount++;
}
Status = FileHandleFindNextFile (DirHandle, FileInfo, &NoFile);
if (EFI_ERROR (Status)) {
Print (L"Get Next File Fail. Status = %r\n", Status);
goto Done;
}
} while (!NoFile);
if (FileCount == 0) { if (FileCount == 0) {
Print (L"Error: No capsule file found!\n"); Print (L"Error: No capsule file found!\n");
return EFI_NOT_FOUND; Status = EFI_NOT_FOUND;
goto Done;
} }
FileInfoBuffer = AllocatePool (sizeof(FileInfo) * FileCount); FileInfoBuffer = AllocateZeroPool (sizeof (FileInfo) * FileCount);
if (FileInfoBuffer == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto Done;
}
NoFile = FALSE; NoFile = FALSE;
// //
// Get all file info // Get all file info
// //
for ( Status = FileHandleFindFirstFile (DirHandle, &FileInfo) do {
; !EFI_ERROR (Status) && !NoFile Status = FileHandleFindFirstFile (DirHandle, &FileInfo);
; Status = FileHandleFindNextFile (DirHandle, FileInfo, &NoFile) if (EFI_ERROR (Status) || FileInfo == NULL) {
){ Print (L"Get File Info Fail. Status = %r\n", Status);
if ((FileInfo->Attribute & (EFI_FILE_SYSTEM | EFI_FILE_ARCHIVE)) == 0) { goto Done;
continue;
} }
FileInfoBuffer[Index++] = AllocateCopyPool ((UINTN)FileInfo->Size, FileInfo);
} if ((FileInfo->Attribute & (EFI_FILE_SYSTEM | EFI_FILE_ARCHIVE)) != 0) {
FileInfoBuffer[Index++] = AllocateCopyPool ((UINTN)FileInfo->Size, FileInfo);
}
Status = FileHandleFindNextFile (DirHandle, FileInfo, &NoFile);
if (EFI_ERROR (Status)) {
Print (L"Get Next File Fail. Status = %r\n", Status);
goto Done;
}
} while (!NoFile);
// //
// Sort FileInfoBuffer by alphabet order // Sort FileInfoBuffer by alphabet order
@ -866,7 +887,8 @@ DumpCapsuleFromDisk (
} }
if (!DumpCapsuleInfo) { if (!DumpCapsuleInfo) {
return EFI_SUCCESS; Status = EFI_SUCCESS;
goto Done;
} }
Print(L"The infomation of the capsules:\n"); Print(L"The infomation of the capsules:\n");
@ -875,27 +897,28 @@ DumpCapsuleFromDisk (
FileHandle = NULL; FileHandle = NULL;
Status = DirHandle->Open (DirHandle, &FileHandle, FileInfoBuffer[Index]->FileName, EFI_FILE_MODE_READ, 0); Status = DirHandle->Open (DirHandle, &FileHandle, FileInfoBuffer[Index]->FileName, EFI_FILE_MODE_READ, 0);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
break; goto Done;
} }
Status = FileHandleGetSize (FileHandle, (UINT64 *) &FileSize); Status = FileHandleGetSize (FileHandle, (UINT64 *) &FileSize);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
Print (L"Cannot read file %s. Status = %r\n", FileInfoBuffer[Index]->FileName, Status); Print (L"Cannot read file %s. Status = %r\n", FileInfoBuffer[Index]->FileName, Status);
FileHandleClose (FileHandle); FileHandleClose (FileHandle);
return Status; goto Done;
} }
FileBuffer = AllocatePool (FileSize); FileBuffer = AllocatePool (FileSize);
if (FileBuffer == NULL) { if (FileBuffer == NULL) {
return RETURN_OUT_OF_RESOURCES; Status = EFI_OUT_OF_RESOURCES;
goto Done;
} }
Status = FileHandleRead (FileHandle, &FileSize, FileBuffer); Status = FileHandleRead (FileHandle, &FileSize, FileBuffer);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
Print (L"Cannot read file %s. Status = %r\n", FileInfoBuffer[Index]->FileName, Status); Print (L"Cannot read file %s. Status = %r\n", FileInfoBuffer[Index]->FileName, Status);
FreePool (FileBuffer);
FileHandleClose (FileHandle); FileHandleClose (FileHandle);
return Status; FreePool (FileBuffer);
goto Done;
} }
Print (L"**************************\n"); Print (L"**************************\n");
@ -906,7 +929,17 @@ DumpCapsuleFromDisk (
FreePool (FileBuffer); FreePool (FileBuffer);
} }
return EFI_SUCCESS; Done:
if (FileInfoBuffer != NULL) {
for (Index = 0; Index < FileCount; Index++) {
if (FileInfoBuffer[Index] != NULL) {
FreePool (FileInfoBuffer[Index]);
}
}
FreePool (FileInfoBuffer);
}
return Status;
} }
/** /**