From: "Marvin Häuser" <mhaeuser@posteo.de>
To: Savva Mitrofanov <savvamtr@gmail.com>
Cc: devel@edk2.groups.io, Pedro Falcato <pedro.falcato@gmail.com>,
Vitaly Cheptsov <vit9696@protonmail.com>
Subject: Re: [edk2-platforms][PATCH v4 11/12] Ext4Pkg: Filter out directory entry names containing \0 as invalid
Date: Thu, 2 Feb 2023 10:30:07 +0000 [thread overview]
Message-ID: <6B3BC377-63FC-49BC-8161-B1B889FDEDC0@posteo.de> (raw)
In-Reply-To: <20230202102133.51606-12-savvamtr@gmail.com>
Reviewed-by: Marvin Häuser <mhaeuser@posteo.de>
> On 2. Feb 2023, at 11:21, 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>
> Reviewed-by: Pedro Falcato <pedro.falcato@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 dee8cfc66cb7..88f89a40534c 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;
> + UINT8 Index;
> 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.1
>
next prev parent reply other threads:[~2023-02-02 10:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-02 10:21 [edk2-platforms][PATCH v4 00/12] Ext4Pkg: Code correctness and security improvements Savva Mitrofanov
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 01/12] Ext4Pkg: Fix memory leak in Ext4RetrieveDirent Savva Mitrofanov
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 02/12] Ext4Pkg: Fix incorrect checksum metadata feature check Savva Mitrofanov
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 03/12] Ext4Pkg: Fix division by zero by adding check for s_inodes_per_group Savva Mitrofanov
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 04/12] Ext4Pkg: Add inode number validity check Savva Mitrofanov
2023-02-02 10:32 ` Marvin Häuser
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 05/12] Ext4Pkg: Fix shift out of bounds in Ext4OpenSuperblock Savva Mitrofanov
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 06/12] Ext4Pkg: Corrects integer overflow check logic in DiskUtil Savva Mitrofanov
2023-02-02 10:31 ` Marvin Häuser
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 07/12] Ext4Pkg: Check that source file is directory in Ext4OpenInternal Savva Mitrofanov
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 08/12] Ext4Pkg: Check VolumeName allocation correctness in Ext4GetVolumeName Savva Mitrofanov
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 09/12] Ext4Pkg: Add missing exit Status in Ext4OpenDirent Savva Mitrofanov
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 10/12] Ext4Pkg: Fixes build on MSVC Savva Mitrofanov
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 11/12] Ext4Pkg: Filter out directory entry names containing \0 as invalid Savva Mitrofanov
2023-02-02 10:30 ` Marvin Häuser [this message]
2023-02-02 10:21 ` [edk2-platforms][PATCH v4 12/12] Ext4Pkg: Corrects memory leak in Ext4ReadSlowSymlink Savva Mitrofanov
2023-02-02 10:29 ` Marvin Häuser
2023-02-08 16:32 ` [edk2-platforms][PATCH v4 00/12] Ext4Pkg: Code correctness and security improvements Pedro Falcato
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=6B3BC377-63FC-49BC-8161-B1B889FDEDC0@posteo.de \
--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