From: "Pedro Falcato" <pedro.falcato@gmail.com>
To: devel@edk2.groups.io
Cc: Pedro Falcato <pedro.falcato@gmail.com>,
Leif Lindholm <leif@nuviainc.com>,
Michael D Kinney <michael.d.kinney@intel.com>,
Bret Barkelew <Bret.Barkelew@microsoft.com>
Subject: [PATCH 1/3] Ext4Pkg: Fix incorrect usage of Ext4InitExtentsMap.
Date: Thu, 19 Aug 2021 22:28:41 +0100 [thread overview]
Message-ID: <20210819212843.37454-2-pedro.falcato@gmail.com> (raw)
In-Reply-To: <20210819212843.37454-1-pedro.falcato@gmail.com>
Fixes bug triggered by ShellPkg code, in usage of EFI_FILE_PROTOCOL's
Open().
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Pedro Falcato <pedro.falcato@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
next prev parent reply other threads:[~2021-08-19 21:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-19 21:28 [PATCH 0/3] Ext4Pkg: Fix bugs triggered by MdePkg and ShellPkg Pedro Falcato
2021-08-19 21:28 ` Pedro Falcato [this message]
2021-08-19 21:28 ` [PATCH 2/3] Ext4Pkg: Hide "." and ".." entries from Read() callers Pedro Falcato
2021-08-19 21:28 ` [PATCH 3/3] Ext4Pkg: Add a directory entry tree Pedro Falcato
2021-08-19 22:43 ` [edk2-devel] [PATCH 0/3] Ext4Pkg: Fix bugs triggered by MdePkg and ShellPkg Michael D Kinney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210819212843.37454-2-pedro.falcato@gmail.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox