From: "Wang, Jian J" <jian.j.wang@intel.com>
To: "Bi, Dandan" <dandan.bi@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Gao, Liming" <liming.gao@intel.com>, "Dong, Eric" <eric.dong@intel.com>
Subject: Re: [patch 1/2] MdeModulePkg/String.c: Zero memory before free (CVE-2019-14558)
Date: Thu, 13 Feb 2020 04:06:26 +0000 [thread overview]
Message-ID: <D827630B58408649ACB04F44C510003625A0D9C3@SHSMSX107.ccr.corp.intel.com> (raw)
In-Reply-To: <20200213040303.53336-2-dandan.bi@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Regards,
Jian
> -----Original Message-----
> From: Bi, Dandan <dandan.bi@intel.com>
> Sent: Thursday, February 13, 2020 12:03 PM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Wang, Jian J <jian.j.wang@intel.com>
> Subject: [patch 1/2] MdeModulePkg/String.c: Zero memory before free (CVE-
> 2019-14558)
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1611
>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Signed-off-by: Dandan Bi <dandan.bi@intel.com>
> ---
> MdeModulePkg/Universal/HiiDatabaseDxe/String.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
> b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
> index 505e063d49..10a1e691a3 100644
> --- a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
> +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
> @@ -1004,10 +1004,11 @@ SetStringWorker (
> BlockPtr,
> StringTextPtr + AsciiStrSize ((CHAR8 *)StringTextPtr),
> TmpSize
> );
>
> + ZeroMem (StringPackage->StringBlock, OldBlockSize);
> FreePool (StringPackage->StringBlock);
> StringPackage->StringBlock = Block;
> StringPackage->StringPkgHdr->Header.Length += (UINT32) (BlockSize -
> OldBlockSize);
> break;
>
> @@ -1037,10 +1038,11 @@ SetStringWorker (
> BlockPtr,
> StringTextPtr + StringSize,
> OldBlockSize - (StringTextPtr - StringPackage->StringBlock) - StringSize
> );
>
> + ZeroMem (StringPackage->StringBlock, OldBlockSize);
> FreePool (StringPackage->StringBlock);
> StringPackage->StringBlock = Block;
> StringPackage->StringPkgHdr->Header.Length += (UINT32) (BlockSize -
> OldBlockSize);
> break;
>
> @@ -1088,10 +1090,11 @@ SetStringWorker (
> );
> BlockPtr += StrSize (GlobalFont->FontInfo->FontName);
>
> CopyMem (BlockPtr, StringPackage->StringBlock, OldBlockSize);
>
> + ZeroMem (StringPackage->StringBlock, OldBlockSize);
> FreePool (StringPackage->StringBlock);
> StringPackage->StringBlock = Block;
> StringPackage->StringPkgHdr->Header.Length += Ext2.Length;
>
> return EFI_SUCCESS;
> @@ -1273,10 +1276,11 @@ HiiNewString (
>
> //
> // Append a EFI_HII_SIBT_END block to the end.
> //
> *BlockPtr = EFI_HII_SIBT_END;
> + ZeroMem (StringPackage->StringBlock, OldBlockSize);
> FreePool (StringPackage->StringBlock);
> StringPackage->StringBlock = StringBlock;
> StringPackage->StringPkgHdr->Header.Length += Ucs2BlockSize;
> PackageListNode->PackageListHdr.PackageLength += Ucs2BlockSize;
> }
> @@ -1404,10 +1408,11 @@ HiiNewString (
>
> //
> // Append a EFI_HII_SIBT_END block to the end.
> //
> *BlockPtr = EFI_HII_SIBT_END;
> + ZeroMem (StringPackage->StringBlock, OldBlockSize);
> FreePool (StringPackage->StringBlock);
> StringPackage->StringBlock = StringBlock;
> StringPackage->StringPkgHdr->Header.Length += Ucs2BlockSize;
> PackageListNode->PackageListHdr.PackageLength += Ucs2BlockSize;
>
> @@ -1446,10 +1451,11 @@ HiiNewString (
>
> //
> // Append a EFI_HII_SIBT_END block to the end.
> //
> *BlockPtr = EFI_HII_SIBT_END;
> + ZeroMem (StringPackage->StringBlock, OldBlockSize);
> FreePool (StringPackage->StringBlock);
> StringPackage->StringBlock = StringBlock;
> StringPackage->StringPkgHdr->Header.Length += Ucs2FontBlockSize;
> PackageListNode->PackageListHdr.PackageLength += Ucs2FontBlockSize;
>
> @@ -1507,10 +1513,11 @@ HiiNewString (
>
> //
> // Append a EFI_HII_SIBT_END block to the end.
> //
> *BlockPtr = EFI_HII_SIBT_END;
> + ZeroMem (StringPackage->StringBlock, OldBlockSize);
> FreePool (StringPackage->StringBlock);
> StringPackage->StringBlock = StringBlock;
> StringPackage->StringPkgHdr->Header.Length += FontBlockSize +
> Ucs2FontBlockSize;
> PackageListNode->PackageListHdr.PackageLength += FontBlockSize +
> Ucs2FontBlockSize;
>
> --
> 2.18.0.windows.1
next prev parent reply other threads:[~2020-02-13 4:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 4:03 [patch] MdeModulePkg/HiiDB: Remove configuration table when it's freed (CVE-2019-14586) Dandan Bi
2020-02-13 4:03 ` [patch 1/2] MdeModulePkg/String.c: Zero memory before free (CVE-2019-14558) Dandan Bi
2020-02-13 4:06 ` Wang, Jian J [this message]
2020-02-14 6:44 ` Dong, Eric
2020-02-13 4:03 ` [patch 2/2] MdeModulePkg/DisplayEngine: " Dandan Bi
2020-02-13 4:11 ` Wang, Jian J
2020-02-14 6:45 ` Dong, Eric
2020-02-13 4:05 ` [patch] MdeModulePkg/HiiDB: Remove configuration table when it's freed (CVE-2019-14586) Wang, Jian J
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=D827630B58408649ACB04F44C510003625A0D9C3@SHSMSX107.ccr.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