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

ShellPkg/rm: fix hang when deleting an absolutely-empty directory 

An ordinary empty directory should contain "." and ".." entries.
When an empty directory even doesn't contain "." or ".." entry,
FileHandleFindFirstFile() may return error status and a NULL
FileInfo.
IsDirectoryEmpty() implementation in Rm.c doesn't consider this
case and the deference of FileInfo->FileName causes page fault
exception because FileInfo is NULL.
The patch checks the return status of FileHandleFindFirstFile()
to fix this issue.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Ruiyu Ni 2018-02-08 11:40:04 +08:00
parent 1efda6414f
commit 7506fe43a1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ShellPkg/Library/UefiShellLevel2CommandsLib/Rm.c
View File

@ -2,7 +2,7 @@
Main file for attrib shell level 2 function. Main file for attrib shell level 2 function.
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR> (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -33,6 +33,7 @@ IsDirectoryEmpty (
IN EFI_HANDLE FileHandle IN EFI_HANDLE FileHandle
) )
{ {
EFI_STATUS Status;
EFI_FILE_INFO *FileInfo; EFI_FILE_INFO *FileInfo;
BOOLEAN NoFile; BOOLEAN NoFile;
BOOLEAN RetVal; BOOLEAN RetVal;
@ -41,8 +42,8 @@ IsDirectoryEmpty (
NoFile = FALSE; NoFile = FALSE;
FileInfo = NULL; FileInfo = NULL;
for (FileHandleFindFirstFile(FileHandle, &FileInfo) for (Status = FileHandleFindFirstFile(FileHandle, &FileInfo)
; !NoFile ; !NoFile && !EFI_ERROR (Status)
; FileHandleFindNextFile(FileHandle, FileInfo, &NoFile) ; FileHandleFindNextFile(FileHandle, FileInfo, &NoFile)
){ ){
if (StrStr(FileInfo->FileName, L".") != FileInfo->FileName if (StrStr(FileInfo->FileName, L".") != FileInfo->FileName