[edk2-devel] [PATCH 1/3] Ext4Pkg: Fix incorrect usage of Ext4InitExtentsMap.
Pedro Falcato
pedro.falcato at gmail.com
Thu Aug 19 21:28:41 UTC 2021
Fixes bug triggered by ShellPkg code, in usage of EFI_FILE_PROTOCOL's
Open().
Cc: Leif Lindholm <leif at nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney at intel.com>
Cc: Bret Barkelew <Bret.Barkelew at microsoft.com>
Signed-off-by: Pedro Falcato <pedro.falcato at gmail.com>
---
Features/Ext4Pkg/Ext4Dxe/File.c | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/Features/Ext4Pkg/Ext4Dxe/File.c b/Features/Ext4Pkg/Ext4Dxe/File.c
index 0f5fa6f73f..a3eff2b48a 100644
--- a/Features/Ext4Pkg/Ext4Dxe/File.c
+++ b/Features/Ext4Pkg/Ext4Dxe/File.c
@@ -207,6 +207,11 @@ Ext4Open (
FileName += Length;
+ if (StrCmp(PathSegment, L".") == 0) {
+ // Opens of "." are a no-op
+ continue;
+ }
+
DEBUG ((DEBUG_FS, "[ext4] Opening %s\n", PathSegment));
if (!Ext4FileIsDir (Current)) {
@@ -512,12 +517,20 @@ Ext4GetFileInfo (
IN EXT4_FILE *File, OUT EFI_FILE_INFO *Info, IN OUT UINTN *BufferSize
)
{
- UINTN FileNameLen;
- UINTN FileNameSize;
- UINTN NeededLength;
+ UINTN FileNameLen;
+ UINTN FileNameSize;
+ UINTN NeededLength;
+ CONST CHAR16 *FileName;
+
+ if (File->InodeNum == 2) {
+ // Root inode gets a filename of "", regardless of how it was opened.
+ FileName = L"";
+ } else {
+ FileName = File->FileName;
+ }
- FileNameLen = StrLen (File->FileName);
- FileNameSize = StrSize (File->FileName);
+ FileNameLen = StrLen (FileName);
+ FileNameSize = StrSize (FileName);
NeededLength = SIZE_OF_EFI_FILE_INFO + FileNameSize;
@@ -540,7 +553,7 @@ Ext4GetFileInfo (
*BufferSize = NeededLength;
- return StrCpyS (Info->FileName, FileNameLen + 1, File->FileName);
+ return StrCpyS (Info->FileName, FileNameLen + 1, FileName);
}
/**
@@ -687,6 +700,7 @@ Ext4DuplicateFile (
{
EXT4_PARTITION *Partition;
EXT4_FILE *File;
+ EFI_STATUS Status;
Partition = Original->Partition;
File = AllocateZeroPool (sizeof (EXT4_FILE));
@@ -717,7 +731,8 @@ Ext4DuplicateFile (
File->InodeNum = Original->InodeNum;
File->OpenMode = 0; // Will be filled by other code
- if (!Ext4InitExtentsMap (File)) {
+ Status = Ext4InitExtentsMap (File);
+ if (EFI_ERROR (Status)) {
FreePool (File->FileName);
FreePool (File->Inode);
FreePool (File);
--
2.33.0
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#79592): https://edk2.groups.io/g/devel/message/79592
Mute This Topic: https://groups.io/mt/85007621/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list