From: "Savva Mitrofanov" <savvamtr@gmail.com>
To: "Marvin Häuser" <mhaeuser@posteo.de>
Cc: devel@edk2.groups.io, "Pedro Falcato" <pedro.falcato@gmail.com>,
"Виталий Юрьевич Чепцов" <vit9696@protonmail.com>
Subject: Re: [edk2-platforms][PATCH v3 11/11] Ext4Pkg: Filter out directory entry names containing \0 as invalid
Date: Mon, 30 Jan 2023 14:19:57 +0600 [thread overview]
Message-ID: <AFF646B3-BCB1-4427-8080-67FD23D012A0@gmail.com> (raw)
In-Reply-To: <B37F555D-E41E-44D8-984F-2762C1E735F0@posteo.de>
It is not so important from my point of view, however, I corrected this in the referenced repository fork.
> On 27 Jan 2023, at 16:04, Marvin Häuser <mhaeuser@posteo.de> wrote:
>
> On 27. Jan 2023, at 10:29, Savva Mitrofanov <savvamtr@gmail.com> wrote:
>>
>> The directory entry name conventions forbid having null-terminator
>> symbols in its body and can lead to undefined behavior conditions
>> and crashes
>>
>> Cc: Marvin Häuser <mhaeuser@posteo.de>
>> Cc: Pedro Falcato <pedro.falcato@gmail.com>
>> Cc: Vitaly Cheptsov <vit9696@protonmail.com>
>> Fixes: 89b2bb0db263 ("Ext4Pkg: Fix and clarify handling regarding non-utf8 dir entries")
>> Signed-off-by: Savva Mitrofanov <savvamtr@gmail.com>
>> ---
>> Features/Ext4Pkg/Ext4Dxe/Directory.c | 9 ++++++++-
>> 1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/Features/Ext4Pkg/Ext4Dxe/Directory.c b/Features/Ext4Pkg/Ext4Dxe/Directory.c
>> index 0753a20b5377..465749c9b51d 100644
>> --- a/Features/Ext4Pkg/Ext4Dxe/Directory.c
>> +++ b/Features/Ext4Pkg/Ext4Dxe/Directory.c
>> @@ -28,9 +28,16 @@ Ext4GetUcs2DirentName (
>> {
>> CHAR8 Utf8NameBuf[EXT4_NAME_MAX + 1];
>> UINT16 *Str;
>> + UINTN Index;
>
> I *really* do not like UINTN in code that does not deal with buffer addresses and sizes. I'd change it to UINT8, but I'll leave it up to Pedro.
>
>> EFI_STATUS Status;
>>
>> - CopyMem (Utf8NameBuf, Entry->name, Entry->name_len);
>> + for (Index = 0; Index < Entry->name_len; ++Index) {
>> + if (Entry->name[Index] == '\0') {
>> + return EFI_INVALID_PARAMETER;
>> + }
>> +
>> + Utf8NameBuf[Index] = Entry->name[Index];
>> + }
>>
>> Utf8NameBuf[Entry->name_len] = '\0';
>>
>> --
>> 2.39.0
>>
>
prev parent reply other threads:[~2023-01-30 8:20 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-27 9:29 [edk2-platforms][PATCH v3 00/11] Ext4Pkg: Code correctness and security improvements Savva Mitrofanov
2023-01-27 9:29 ` [edk2-platforms][PATCH v3 01/11] Ext4Pkg: Fix memory leak in Ext4RetrieveDirent Savva Mitrofanov
2023-01-27 14:12 ` Pedro Falcato
2023-01-27 14:16 ` Marvin Häuser
2023-01-27 9:29 ` [edk2-platforms][PATCH v3 02/11] Ext4Pkg: Fix incorrect checksum metadata feature check Savva Mitrofanov
2023-01-27 10:02 ` Marvin Häuser
2023-01-27 14:29 ` Pedro Falcato
2023-01-30 8:38 ` Marvin Häuser
2023-01-30 8:42 ` Savva Mitrofanov
2023-01-27 9:29 ` [edk2-platforms][PATCH v3 03/11] Ext4Pkg: Fix division by zero by adding check for s_inodes_per_group Savva Mitrofanov
2023-01-27 14:13 ` Pedro Falcato
2023-01-27 14:16 ` Marvin Häuser
2023-01-27 9:29 ` [edk2-platforms][PATCH v3 04/11] Ext4Pkg: Add inode number validity check Savva Mitrofanov
2023-01-27 14:19 ` Pedro Falcato
2023-02-02 10:15 ` Savva Mitrofanov
2023-01-27 9:29 ` [edk2-platforms][PATCH v3 05/11] Ext4Pkg: Fix shift out of bounds in Ext4OpenSuperblock Savva Mitrofanov
2023-01-27 14:22 ` Pedro Falcato
2023-01-27 14:24 ` Marvin Häuser
2023-01-27 16:14 ` Savva Mitrofanov
2023-01-27 9:29 ` [edk2-platforms][PATCH v3 06/11] Ext4Pkg: Corrects integer overflow check logic in DiskUtil Savva Mitrofanov
2023-01-27 14:24 ` Pedro Falcato
2023-01-27 16:10 ` Savva Mitrofanov
2023-01-27 16:21 ` Pedro Falcato
2023-01-27 9:29 ` [edk2-platforms][PATCH v3 07/11] Ext4Pkg: Check that source file is directory in Ext4OpenInternal Savva Mitrofanov
2023-01-27 14:26 ` Pedro Falcato
2023-01-27 14:33 ` Marvin Häuser
2023-01-27 9:29 ` [edk2-platforms][PATCH v3 08/11] Ext4Pkg: Check VolumeName allocation correctness in Ext4GetVolumeName Savva Mitrofanov
2023-01-27 14:27 ` [edk2-devel] " Pedro Falcato
2023-01-27 14:34 ` Marvin Häuser
2023-01-27 9:29 ` [edk2-platforms][PATCH v3 09/11] Ext4Pkg: Add missing exit Status in Ext4OpenDirent Savva Mitrofanov
2023-01-27 14:28 ` Pedro Falcato
2023-01-27 14:34 ` Marvin Häuser
2023-01-27 9:29 ` [edk2-platforms][PATCH v3 10/11] Ext4Pkg: Fixes build on MSVC Savva Mitrofanov
2023-01-27 14:33 ` Pedro Falcato
2023-01-27 14:36 ` Marvin Häuser
2023-01-30 8:35 ` Marvin Häuser
2023-01-27 9:29 ` [edk2-platforms][PATCH v3 11/11] Ext4Pkg: Filter out directory entry names containing \0 as invalid Savva Mitrofanov
2023-01-27 10:04 ` Marvin Häuser
2023-01-27 14:09 ` Pedro Falcato
2023-01-27 14:14 ` Marvin Häuser
2023-01-30 8:48 ` Marvin Häuser
2023-01-30 8:19 ` Savva Mitrofanov [this message]
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=AFF646B3-BCB1-4427-8080-67FD23D012A0@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