From: Laszlo Ersek <lersek@redhat.com>
To: Paulo Alcantara <pcacjr@zytor.com>, edk2-devel@lists.01.org
Cc: Ruiyu Ni <ruiyu.ni@intel.com>, Eric Dong <eric.dong@intel.com>,
Star Zeng <star.zeng@intel.com>
Subject: Re: [PATCH] MdeModulePkg/UdfDxe: Fix NULL pointer dereference
Date: Tue, 12 Sep 2017 13:27:59 +0200 [thread overview]
Message-ID: <f11d240c-d5a2-8e8e-7392-421b97023235@redhat.com> (raw)
In-Reply-To: <547dab7a7ae9ccf165e24c82134c911dc626d161.1505179788.git.pcacjr@zytor.com>
On 09/12/17 03:30, Paulo Alcantara wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=704
>
> For root directory, the FID (File Identifier Descriptor) pointer is
> accessible through PRIVATE_UDF_FILE_DATA.Root, whereas non-root
> directory and regular files, their FIDs are accessible through
> PRIVATE_UDF_FILE_DATA.File.
>
> In UdfSetPosition(), the FID was retrieved through
> PRIVATE_UDF_FILE_DATA.File, hence when calling it with a root directory,
> PRIVATE_UDF_FILE_DATA.File.FileIdentifierDescriptor would be NULL and
> then dereferenced.
>
> This patch fixes the NULL pointer dereference by calling _FILE() to
> transparently return the correct UDF_FILE_INFO * which points to a valid
> FID descriptor of a specific file.
>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Steven Shi <steven.shi@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Reported-by: Steven Shi <steven.shi@intel.com>
> Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
> ---
> MdeModulePkg/Universal/Disk/UdfDxe/File.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/File.c b/MdeModulePkg/Universal/Disk/UdfDxe/File.c
> index 8b9339567f..a1eb2196df 100644
> --- a/MdeModulePkg/Universal/Disk/UdfDxe/File.c
> +++ b/MdeModulePkg/Universal/Disk/UdfDxe/File.c
> @@ -690,7 +690,8 @@ UdfSetPosition (
>
> PrivFileData = PRIVATE_UDF_FILE_DATA_FROM_THIS (This);
>
> - FileIdentifierDesc = PrivFileData->File.FileIdentifierDesc;
> + FileIdentifierDesc = _FILE (PrivFileData)->FileIdentifierDesc;
> + ASSERT (FileIdentifierDesc != NULL);
> if (IS_FID_DIRECTORY_FILE (FileIdentifierDesc)) {
> //
> // If the file handle is a directory, the _only_ position that may be set is
>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thanks!
Laszlo
next prev parent reply other threads:[~2017-09-12 11:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-12 1:30 [PATCH] MdeModulePkg/UdfDxe: Fix NULL pointer dereference Paulo Alcantara
2017-09-12 11:27 ` Laszlo Ersek [this message]
2017-09-14 13:59 ` Paulo Alcantara
2017-09-15 1:39 ` Zeng, Star
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=f11d240c-d5a2-8e8e-7392-421b97023235@redhat.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