From: "Carsey, Jaben" <jaben.carsey@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"xypron.glpk@gmx.de" <xypron.glpk@gmx.de>,
"Gao, Zhichao" <zhichao.gao@intel.com>
Cc: "Ni, Ray" <ray.ni@intel.com>,
Leif Lindholm <leif.lindholm@linaro.org>,
"Gao, Liming" <liming.gao@intel.com>
Subject: Re: [edk2-devel] [PATCH v3 1/1] ShellPkg/CommandLib: avoid NULL derefence and memory leak
Date: Fri, 10 May 2019 14:32:17 +0000 [thread overview]
Message-ID: <CB6E33457884FA40993F35157061515CBCC2D910@FMSMSX103.amr.corp.intel.com> (raw)
In-Reply-To: <20190510032419.14540-1-xypron.glpk@gmx.de>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Code change looks good visually.
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Heinrich Schuchardt
> Sent: Thursday, May 09, 2019 8:24 PM
> To: Gao, Zhichao <zhichao.gao@intel.com>
> Cc: devel @ edk2 . groups . io <devel@edk2.groups.io>; Carsey, Jaben
> <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>; Leif Lindholm
> <leif.lindholm@linaro.org>; Gao, Liming <liming.gao@intel.com>; Heinrich
> Schuchardt <xypron.glpk@gmx.de>
> Subject: [edk2-devel] [PATCH v3 1/1] ShellPkg/CommandLib: avoid NULL
> derefence and memory leak
> Importance: High
>
> Since TianoCore EDK2 commit d65f2cea36d1 ("ShellPkg/CommandLib: Locate
> proper UnicodeCollation instance") in edk2 the UEFI Shell crashes if EFI
> variable PlatformLang is not defined due to dereferencing gUnicodeCollation
> gUnicodeCollation (= NULL) in ShellCommandRegisterCommandName().
>
> Furthermore CommandInit() is leaking PlatformLang if
> gUnicodeCollation != NULL.
>
> Close the memory leak and use the first UnicodeCollation instance if
> PlatfomLang is not defined.
>
> Fixes: d65f2cea36d1 ("ShellPkg/CommandLib: Locate proper
> UnicodeCollation
> instance")
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
> v3
> resend as quoted-printable
> ---
> .../UefiShellCommandLib/UefiShellCommandLib.c | 20 +++++++++++++-----
> -
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
> b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
> index ddc4bb1567..e60279e5ac 100644
> --- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
> +++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
> @@ -80,12 +80,10 @@ CommandInit(
> EFI_STATUS Status;
>
> CHAR8 *PlatformLang;
>
>
>
> - GetEfiGlobalVariable2 (EFI_PLATFORM_LANG_VARIABLE_NAME,
> (VOID**)&PlatformLang, NULL);
>
> - if (PlatformLang == NULL) {
>
> - return EFI_UNSUPPORTED;
>
> - }
>
> -
>
> if (gUnicodeCollation == NULL) {
>
> +
>
> + GetEfiGlobalVariable2 (EFI_PLATFORM_LANG_VARIABLE_NAME,
> (VOID**)&PlatformLang, NULL);
>
> +
>
> Status = gBS->LocateHandleBuffer (
>
> ByProtocol,
>
> &gEfiUnicodeCollation2ProtocolGuid,
>
> @@ -113,6 +111,14 @@ CommandInit(
> continue;
>
> }
>
>
>
> + //
>
> + // Without clue provided use the first Unicode Collation2 protocol.
>
> + //
>
> + if (PlatformLang == NULL) {
>
> + gUnicodeCollation = Uc;
>
> + break;
>
> + }
>
> +
>
> //
>
> // Find the best matching matching language from the supported
> languages
>
> // of Unicode Collation2 protocol.
>
> @@ -132,7 +138,9 @@ CommandInit(
> if (Handles != NULL) {
>
> FreePool (Handles);
>
> }
>
> - FreePool (PlatformLang);
>
> + if (PlatformLang != NULL) {
>
> + FreePool (PlatformLang);
>
> + }
>
> }
>
>
>
> return (gUnicodeCollation == NULL) ? EFI_UNSUPPORTED : EFI_SUCCESS;
>
> --
> 2.20.1
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
>
> View/Reply Online (#40395): https://edk2.groups.io/g/devel/message/40395
> Mute This Topic: https://groups.io/mt/31573312/1760878
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [jaben.carsey@intel.com]
> -=-=-=-=-=-=
next prev parent reply other threads:[~2019-05-10 14:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-10 3:24 [PATCH v3 1/1] ShellPkg/CommandLib: avoid NULL derefence and memory leak Heinrich Schuchardt
2019-05-10 14:32 ` Carsey, Jaben [this message]
2019-09-02 10:14 ` [edk2-devel] " Heinrich Schuchardt
2019-09-03 4:59 ` Nate DeSimone
2019-09-03 7:14 ` Liming Gao
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=CB6E33457884FA40993F35157061515CBCC2D910@FMSMSX103.amr.corp.intel.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