From: "Chiu, Chasel" <chasel.chiu@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"pedro.falcato@gmail.com" <pedro.falcato@gmail.com>,
"rsingh@ventanamicro.com" <rsingh@ventanamicro.com>
Cc: "Desimone, Nathaniel L" <nathaniel.l.desimone@intel.com>,
"Zeng, Star" <star.zeng@intel.com>,
Ranbir Singh <Ranbir.Singh3@dell.com>
Subject: Re: [edk2-devel] [PATCH 1/1] IntelFsp2Pkg/Library/BaseFspCommonLib: Fix OVERRUN Coverity issue
Date: Tue, 30 May 2023 03:28:36 +0000 [thread overview]
Message-ID: <BN9PR11MB5483873DE390B0437E629379E64B9@BN9PR11MB5483.namprd11.prod.outlook.com> (raw)
In-Reply-To: <CAKbZUD17cTJbhdSZjNESnseqnktLFStuq0SFs1Ac7p=AcyAWDQ@mail.gmail.com>
That’s good suggestion Pedro!
Ranbir, would you like me to modify your patch to "return 0" during merging?
Thanks,
Chasel
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Pedro
> Falcato
> Sent: Friday, May 19, 2023 5:29 AM
> To: devel@edk2.groups.io; rsingh@ventanamicro.com
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>; Ranbir
> Singh <Ranbir.Singh3@dell.com>
> Subject: Re: [edk2-devel] [PATCH 1/1] IntelFsp2Pkg/Library/BaseFspCommonLib:
> Fix OVERRUN Coverity issue
>
> On Thu, May 18, 2023 at 4:16 PM Ranbir Singh <rsingh@ventanamicro.com>
> wrote:
> >
> > FspData->PerfIdx is getting increased for every call unconditionally
> > in the function SetFspMeasurePoint and hence memory access can happen
> > for out of bound FspData->PerfData[] array entries also.
> >
> > Example -
> > FspData->PerfData is an array of 32 UINT64 entries. Assume a call
> > is made to SetFspMeasurePoint function when the FspData->PerfIdx
> > last value is 31. It gets incremented to 32 at line 400.
> > Any subsequent call to SetFspMeasurePoint functions leads to
> > FspData->PerfData[32] getting accessed which is out of the PerfData
> > array as well as the FSP_GLOBAL_DATA structure boundary.
> >
> > Hence keep array access and index increment inside if block only and
> > return invalid performance timestamp when PerfIdx is invalid.
> >
> > Cc: Chasel Chiu <chasel.chiu@intel.com>
> > Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> > Cc: Star Zeng <star.zeng@intel.com>
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4200
> > Signed-off-by: Ranbir Singh <Ranbir.Singh3@Dell.com>
> > Signed-off-by: Ranbir Singh <rsingh@ventanamicro.com>
> > ---
> > IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
> > b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
> > index a22b0e7825ad..cda2a7b2478e 100644
> > --- a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
> > +++ b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
> > @@ -377,7 +377,8 @@ GetFspSiliconInitUpdDataPointer (
> >
> > @param[in] Id Measurement point ID.
> >
> > - @return performance timestamp.
> > + @return performance timestamp if current PerfIdx is valid,
> > + else return 0 as invalid performance timestamp
> > **/
> > UINT64
> > EFIAPI
> > @@ -395,9 +396,10 @@ SetFspMeasurePoint (
> > if (FspData->PerfIdx < sizeof (FspData->PerfData) / sizeof (FspData-
> >PerfData[0])) {
> > FspData->PerfData[FspData->PerfIdx] = AsmReadTsc ();
> > ((UINT8 *)(&FspData->PerfData[FspData->PerfIdx]))[7] = Id;
> > + return FspData->PerfData[(FspData->PerfIdx)++];
> > }
> >
> > - return FspData->PerfData[(FspData->PerfIdx)++];
> > + return (UINT64)0x0000000000000000;
>
> return 0;
>
> Works just as well. You also don't need a cast.
>
> https://godbolt.org/z/e5vvGcWWo
>
> --
> Pedro
>
>
>
>
next prev parent reply other threads:[~2023-05-30 3:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-18 6:28 [PATCH 1/1] IntelFsp2Pkg/Library/BaseFspCommonLib: Fix OVERRUN Coverity issue Ranbir Singh
2023-05-18 19:55 ` Chiu, Chasel
2023-05-19 12:29 ` [edk2-devel] " Pedro Falcato
2023-05-30 3:28 ` Chiu, Chasel [this message]
2023-05-30 3:35 ` Ranbir Singh
2023-05-30 5:22 ` Chiu, Chasel
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=BN9PR11MB5483873DE390B0437E629379E64B9@BN9PR11MB5483.namprd11.prod.outlook.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