From: "gaoliming" <gaoliming@byosoft.com.cn>
To: "'Pedro Falcato'" <pedro.falcato@gmail.com>,
"'Kinney, Michael D'" <michael.d.kinney@intel.com>
Cc: "'Yao, Jiewen'" <jiewen.yao@intel.com>,
devel@edk2.groups.io,
"'Vitaly Cheptsov'" <vit9696@protonmail.com>,
"'Marvin Häuser'" <mhaeuser@posteo.de>,
"'Liu, Zhiguang'" <zhiguang.liu@intel.com>
Subject: 回复: [PATCH v2 1/1] MdePkg/BaseLib: Fix out-of-bounds reads in SafeString
Date: Thu, 3 Nov 2022 09:00:54 +0800 [thread overview]
Message-ID: <00df01d8ef1f$b98bef50$2ca3cdf0$@byosoft.com.cn> (raw)
In-Reply-To: <CAKbZUD3+U9VhPPCzOO9VM5RhYtVyCCBROrr1K1gFSA5xjxsdYg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 7292 bytes --]
Pedro:
Marvin gave one suggestion for the code change (https://edk2.groups.io/g/devel/message/95635). Can you response it?
Thanks
Liming
发件人: Pedro Falcato <pedro.falcato@gmail.com>
发送时间: 2022年11月3日 7:42
收件人: Kinney, Michael D <michael.d.kinney@intel.com>
抄送: Yao, Jiewen <jiewen.yao@intel.com>; devel@edk2.groups.io; Vitaly Cheptsov <vit9696@protonmail.com>; Marvin Häuser <mhaeuser@posteo.de>; Gao, Liming <gaoliming@byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu@intel.com>
主题: Re: [PATCH v2 1/1] MdePkg/BaseLib: Fix out-of-bounds reads in SafeString
Can someone push this? Is there a blocker here?
On Wed, Oct 26, 2022 at 4:54 PM Kinney, Michael D <michael.d.kinney@intel.com <mailto:michael.d.kinney@intel.com> > wrote:
Acked-by: Michael D Kinney <michael.d.kinney@intel.com <mailto:michael.d.kinney@intel.com> >
> -----Original Message-----
> From: Yao, Jiewen <jiewen.yao@intel.com <mailto:jiewen.yao@intel.com> >
> Sent: Wednesday, October 26, 2022 6:35 AM
> To: Kinney, Michael D <michael.d.kinney@intel.com <mailto:michael.d.kinney@intel.com> >; Pedro Falcato <pedro.falcato@gmail.com <mailto:pedro.falcato@gmail.com> >; devel@edk2.groups.io <mailto:devel@edk2.groups.io>
> Cc: Vitaly Cheptsov <vit9696@protonmail.com <mailto:vit9696@protonmail.com> >; Marvin Häuser <mhaeuser@posteo.de <mailto:mhaeuser@posteo.de> >; Gao, Liming <gaoliming@byosoft.com.cn <mailto:gaoliming@byosoft.com.cn> >; Liu,
> Zhiguang <zhiguang.liu@intel.com <mailto:zhiguang.liu@intel.com> >
> Subject: RE: [PATCH v2 1/1] MdePkg/BaseLib: Fix out-of-bounds reads in SafeString
>
> That is good catch.
>
> Reviewed-by: Jiewen Yao <Jiewen.yao@Intel.com <mailto:Jiewen.yao@Intel.com> >
>
>
> > -----Original Message-----
> > From: Kinney, Michael D <michael.d.kinney@intel.com <mailto:michael.d.kinney@intel.com> >
> > Sent: Wednesday, October 26, 2022 12:23 AM
> > To: Pedro Falcato <pedro.falcato@gmail.com <mailto:pedro.falcato@gmail.com> >; devel@edk2.groups.io <mailto:devel@edk2.groups.io>
> > Cc: Vitaly Cheptsov <vit9696@protonmail.com <mailto:vit9696@protonmail.com> >; Marvin Häuser
> > <mhaeuser@posteo.de <mailto:mhaeuser@posteo.de> >; Gao, Liming <gaoliming@byosoft.com.cn <mailto:gaoliming@byosoft.com.cn> >; Liu,
> > Zhiguang <zhiguang.liu@intel.com <mailto:zhiguang.liu@intel.com> >; Yao, Jiewen <jiewen.yao@intel.com <mailto:jiewen.yao@intel.com> >
> > Subject: RE: [PATCH v2 1/1] MdePkg/BaseLib: Fix out-of-bounds reads in
> > SafeString
> >
> > Adding Jiewen Yao.
> >
> > Mike
> >
> > > -----Original Message-----
> > > From: Pedro Falcato <pedro.falcato@gmail.com <mailto:pedro.falcato@gmail.com> >
> > > Sent: Monday, October 24, 2022 3:43 PM
> > > To: devel@edk2.groups.io <mailto:devel@edk2.groups.io>
> > > Cc: Pedro Falcato <pedro.falcato@gmail.com <mailto:pedro.falcato@gmail.com> >; Vitaly Cheptsov
> > <vit9696@protonmail.com <mailto:vit9696@protonmail.com> >; Marvin Häuser <mhaeuser@posteo.de <mailto:mhaeuser@posteo.de> >;
> > > Kinney, Michael D <michael.d.kinney@intel.com <mailto:michael.d.kinney@intel.com> >; Gao, Liming
> > <gaoliming@byosoft.com.cn <mailto:gaoliming@byosoft.com.cn> >; Liu, Zhiguang <zhiguang.liu@intel.com <mailto:zhiguang.liu@intel.com> >
> > > Subject: [PATCH v2 1/1] MdePkg/BaseLib: Fix out-of-bounds reads in
> > SafeString
> > >
> > > OpenCore folks established an ASAN-equipped project to fuzz Ext4Dxe,
> > > which was able to catch these (mostly harmless) issues.
> > >
> > > Signed-off-by: Pedro Falcato <pedro.falcato@gmail.com <mailto:pedro.falcato@gmail.com> >
> > > Cc: Vitaly Cheptsov <vit9696@protonmail.com <mailto:vit9696@protonmail.com> >
> > > Cc: Marvin Häuser <mhaeuser@posteo.de <mailto:mhaeuser@posteo.de> >
> > > Cc: Michael D Kinney <michael.d.kinney@intel.com <mailto:michael.d.kinney@intel.com> >
> > > Cc: Liming Gao <gaoliming@byosoft.com.cn <mailto:gaoliming@byosoft.com.cn> >
> > > Cc: Zhiguang Liu <zhiguang.liu@intel.com <mailto:zhiguang.liu@intel.com> >
> > > ---
> > > MdePkg/Library/BaseLib/SafeString.c | 24 ++++++++++++++++++++----
> > > 1 file changed, 20 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/MdePkg/Library/BaseLib/SafeString.c
> > b/MdePkg/Library/BaseLib/SafeString.c
> > > index f338a32a3a41..77a2585ad56d 100644
> > > --- a/MdePkg/Library/BaseLib/SafeString.c
> > > +++ b/MdePkg/Library/BaseLib/SafeString.c
> > > @@ -863,6 +863,9 @@ StrHexToUintnS (
> > > OUT UINTN *Data
> > > )
> > > {
> > > + BOOLEAN FoundLeadingZero;
> > > +
> > > + FoundLeadingZero = FALSE;
> > > ASSERT (((UINTN)String & BIT0) == 0);
> > >
> > > //
> > > @@ -893,11 +896,12 @@ StrHexToUintnS (
> > > // Ignore leading Zeros after the spaces
> > > //
> > > while (*String == L'0') {
> > > + FoundLeadingZero = TRUE;
> > > String++;
> > > }
> > >
> > > if (CharToUpper (*String) == L'X') {
> > > - if (*(String - 1) != L'0') {
> > > + if (!FoundLeadingZero) {
> > > *Data = 0;
> > > return RETURN_SUCCESS;
> > > }
> > > @@ -992,6 +996,9 @@ StrHexToUint64S (
> > > OUT UINT64 *Data
> > > )
> > > {
> > > + BOOLEAN FoundLeadingZero;
> > > +
> > > + FoundLeadingZero = FALSE;
> > > ASSERT (((UINTN)String & BIT0) == 0);
> > >
> > > //
> > > @@ -1022,11 +1029,12 @@ StrHexToUint64S (
> > > // Ignore leading Zeros after the spaces
> > > //
> > > while (*String == L'0') {
> > > + FoundLeadingZero = TRUE;
> > > String++;
> > > }
> > >
> > > if (CharToUpper (*String) == L'X') {
> > > - if (*(String - 1) != L'0') {
> > > + if (!FoundLeadingZero) {
> > > *Data = 0;
> > > return RETURN_SUCCESS;
> > > }
> > > @@ -2393,6 +2401,9 @@ AsciiStrHexToUintnS (
> > > OUT UINTN *Data
> > > )
> > > {
> > > + BOOLEAN FoundLeadingZero;
> > > +
> > > + FoundLeadingZero = FALSE;
> > > //
> > > // 1. Neither String nor Data shall be a null pointer.
> > > //
> > > @@ -2421,11 +2432,12 @@ AsciiStrHexToUintnS (
> > > // Ignore leading Zeros after the spaces
> > > //
> > > while (*String == '0') {
> > > + FoundLeadingZero = TRUE;
> > > String++;
> > > }
> > >
> > > if (AsciiCharToUpper (*String) == 'X') {
> > > - if (*(String - 1) != '0') {
> > > + if (!FoundLeadingZero) {
> > > *Data = 0;
> > > return RETURN_SUCCESS;
> > > }
> > > @@ -2517,6 +2529,9 @@ AsciiStrHexToUint64S (
> > > OUT UINT64 *Data
> > > )
> > > {
> > > + BOOLEAN FoundLeadingZero;
> > > +
> > > + FoundLeadingZero = FALSE;
> > > //
> > > // 1. Neither String nor Data shall be a null pointer.
> > > //
> > > @@ -2545,11 +2560,12 @@ AsciiStrHexToUint64S (
> > > // Ignore leading Zeros after the spaces
> > > //
> > > while (*String == '0') {
> > > + FoundLeadingZero = TRUE;
> > > String++;
> > > }
> > >
> > > if (AsciiCharToUpper (*String) == 'X') {
> > > - if (*(String - 1) != '0') {
> > > + if (!FoundLeadingZero) {
> > > *Data = 0;
> > > return RETURN_SUCCESS;
> > > }
> > > --
> > > 2.38.1
--
Pedro Falcato
[-- Attachment #2: Type: text/html, Size: 14510 bytes --]
next prev parent reply other threads:[~2022-11-03 1:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-24 22:43 [PATCH v2 1/1] MdePkg/BaseLib: Fix out-of-bounds reads in SafeString Pedro Falcato
2022-10-25 16:22 ` Michael D Kinney
2022-10-26 13:34 ` Yao, Jiewen
2022-10-26 13:41 ` Marvin Häuser
2022-10-26 15:54 ` Michael D Kinney
2022-11-02 23:42 ` Pedro Falcato
2022-11-03 1:00 ` gaoliming [this message]
2022-11-03 1:13 ` 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='00df01d8ef1f$b98bef50$2ca3cdf0$@byosoft.com.cn' \
--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