diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2017-11-14 13:29:03 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2017-11-15 20:47:14 +0800 |
| commit | 996bd353d28f6bf48ea6047c71f95c59ac378e61 (patch) | |
| tree | 67e65a7bc0094a4789a93c758ee3e1a09516876e /ShellPkg | |
| parent | 1fbe8276c4031004df8b0516bc038d10f2037dcc (diff) | |
| download | edk2-996bd353d28f6bf48ea6047c71f95c59ac378e61.tar.gz | |
ShellPkg/Shell: Check the OpenVolume result in OpenRootByHandle()
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=779
For the API EfiShellOpenRootByHandle():
The return status of the call to SimpleFileSystem->OpenVolume should be
checked.
It is possible that there is a media change in the device (like CD/DVD
ROM). In such case, the volume root opened and/or the device path opened
previously (also within EfiShellOpenRootByHandle) may be invalid.
This commit adds a check for the result of OpenVolume before subsequently
calling functions like EfiShellGetMapFromDevicePath() &
ConvertEfiFileProtocolToShellHandle().
Cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Diffstat (limited to 'ShellPkg')
| -rw-r--r-- | ShellPkg/Application/Shell/ShellProtocol.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c index dc3deee071..d8b1e065e0 100644 --- a/ShellPkg/Application/Shell/ShellProtocol.c +++ b/ShellPkg/Application/Shell/ShellProtocol.c @@ -827,7 +827,8 @@ EfiShellGetDeviceName( @retval EFI_NOT_FOUND EFI_SIMPLE_FILE_SYSTEM could not be found or the root directory
could not be opened.
@retval EFI_VOLUME_CORRUPTED The data structures in the volume were corrupted.
- @retval EFI_DEVICE_ERROR The device had an error
+ @retval EFI_DEVICE_ERROR The device had an error.
+ @retval Others Error status returned from EFI_SIMPLE_FILE_SYSTEM_PROTOCOL->OpenVolume().
**/
EFI_STATUS
EFIAPI
@@ -867,8 +868,12 @@ EfiShellOpenRootByHandle( // Open the root volume now...
//
Status = SimpleFileSystem->OpenVolume(SimpleFileSystem, &RealFileHandle);
+ if (EFI_ERROR(Status)) {
+ return Status;
+ }
+
*FileHandle = ConvertEfiFileProtocolToShellHandle(RealFileHandle, EfiShellGetMapFromDevicePath(&DevPath));
- return (Status);
+ return (EFI_SUCCESS);
}
/**
|