From: "Pedro Falcato" <pedro.falcato@gmail.com>
To: devel@edk2.groups.io, rsingh@ventanamicro.com
Cc: Chasel Chiu <chasel.chiu@intel.com>,
Nate DeSimone <nathaniel.l.desimone@intel.com>,
Star Zeng <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: Fri, 19 May 2023 13:29:21 +0100 [thread overview]
Message-ID: <CAKbZUD17cTJbhdSZjNESnseqnktLFStuq0SFs1Ac7p=AcyAWDQ@mail.gmail.com> (raw)
In-Reply-To: <20230518062851.184724-1-rsingh@ventanamicro.com>
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-19 12:29 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 ` Pedro Falcato [this message]
2023-05-30 3:28 ` [edk2-devel] " Chiu, Chasel
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='CAKbZUD17cTJbhdSZjNESnseqnktLFStuq0SFs1Ac7p=AcyAWDQ@mail.gmail.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