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

ArmPkg/BdsLib: Close file after reading an Image 

When loading an image from a file, close the file after reading from it.
Use OpenProtocol instead of HandleProtocol to retrieve the simple file
system protocol interface.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <Ronald.Cron@arm.com>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16586 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Ronald Cron 2015-01-06 15:51:02 +00:00 committed by oliviermartin
parent f98f9d9808
commit ad7e31b505
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ArmPkg/Library/BdsLib/BdsFilePath.c
View File

@ -471,14 +471,14 @@ BdsFileSystemLoadImage (
IN EFI_HANDLE Handle,
IN EFI_DEVICE_PATH *RemainingDevicePath,
IN EFI_ALLOCATE_TYPE Type,
IN OUT EFI_PHYSICAL_ADDRESS* Image,
IN OUT EFI_PHYSICAL_ADDRESS *Image,
OUT UINTN *ImageSize
)
{
FILEPATH_DEVICE_PATH* FilePathDevicePath;
EFI_STATUS Status;
FILEPATH_DEVICE_PATH *FilePathDevicePath;
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *FsProtocol;
EFI_FILE_PROTOCOL *Fs;
EFI_STATUS Status;
EFI_FILE_INFO *FileInfo;
EFI_FILE_PROTOCOL *File;
UINTN Size;
@ -487,7 +487,14 @@ BdsFileSystemLoadImage (
FilePathDevicePath = (FILEPATH_DEVICE_PATH*)RemainingDevicePath;
Status = gBS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID **)&FsProtocol);
Status = gBS->OpenProtocol (
Handle,
&gEfiSimpleFileSystemProtocolGuid,
(VOID**)&FsProtocol,
gImageHandle,
Handle,
EFI_OPEN_PROTOCOL_BY_DRIVER
);
if (EFI_ERROR (Status)) {
return Status;
}
@ -495,13 +502,12 @@ BdsFileSystemLoadImage (
// Try to Open the volume and get root directory
Status = FsProtocol->OpenVolume (FsProtocol, &Fs);
if (EFI_ERROR (Status)) {
return Status;
goto CLOSE_PROTOCOL;
}
File = NULL;
Status = Fs->Open (Fs, &File, FilePathDevicePath->PathName, EFI_FILE_MODE_READ, 0);
if (EFI_ERROR (Status)) {
return Status;
goto CLOSE_PROTOCOL;
}
Size = 0;
@ -509,7 +515,7 @@ BdsFileSystemLoadImage (
FileInfo = AllocatePool (Size);
Status = File->GetInfo (File, &gEfiFileInfoGuid, &Size, FileInfo);
if (EFI_ERROR (Status)) {
return Status;
goto CLOSE_FILE;
}
// Get the file size
@ -528,6 +534,16 @@ BdsFileSystemLoadImage (
Status = File->Read (File, &Size, (VOID*)(UINTN)(*Image));
}
CLOSE_FILE:
File->Close (File);
CLOSE_PROTOCOL:
gBS->CloseProtocol (
Handle,
&gEfiSimpleFileSystemProtocolGuid,
gImageHandle,
Handle);
return Status;
}