sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IntelFsp2Pkg/Library/BaseFspCommonLib: Fix OVERRUN Coverity issue

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4200

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>
Signed-off-by: Ranbir Singh <rsingh@ventanamicro.com>
Acked-by: Pedro Falcato <pedro.falcato@gmail.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
This commit is contained in:
Ranbir Singh
2023-05-17 23:28:51 -07:00
committed by mergify[bot]
parent 69e10f0211
commit 48c53994e6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
View File

@@ -377,7 +377,8 @@ GetFspSiliconInitUpdDataPointer (
@param[in] Id Measurement point ID. @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 UINT64
EFIAPI EFIAPI
@@ -395,9 +396,10 @@ SetFspMeasurePoint (
if (FspData->PerfIdx < sizeof (FspData->PerfData) / sizeof (FspData->PerfData[0])) { if (FspData->PerfIdx < sizeof (FspData->PerfData) / sizeof (FspData->PerfData[0])) {
FspData->PerfData[FspData->PerfIdx] = AsmReadTsc (); FspData->PerfData[FspData->PerfIdx] = AsmReadTsc ();
((UINT8 *)(&FspData->PerfData[FspData->PerfIdx]))[7] = Id; ((UINT8 *)(&FspData->PerfData[FspData->PerfIdx]))[7] = Id;
return FspData->PerfData[(FspData->PerfIdx)++];
} }
return FspData->PerfData[(FspData->PerfIdx)++]; return 0;
} }
/** /**