Reviewed-by: Chen Gang C <gang.c.c...@intel.com> BR Gang
-----Original Message----- From: Lin, Du <du....@intel.com> Sent: Tuesday, March 12, 2024 5:20 PM To: devel@edk2.groups.io Cc: Lin, Du <du....@intel.com>; S, Ashraf Ali <ashraf.al...@intel.com>; Chiu, Chasel <chasel.c...@intel.com>; Chen, Gang C <gang.c.c...@intel.com>; Duggapu, Chinni B <chinni.b.dugg...@intel.com>; Desimone, Nathaniel L <nathaniel.l.desim...@intel.com>; Zeng, Star <star.z...@intel.com>; Mohapatra, Susovan <susovan.mohapa...@intel.com>; Kuo, Ted <ted....@intel.com> Subject: [PATCH] IntelFsp2WrapperPkg: Error handling of TpmMeasureAndLogDataWithFlags() REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4700 TpmMeasureAndLogDataWithFlags() computes the measure the code and log it into PCR 0. TpmMeasureAndLogData() computes the hash for the configuration. The same "Status" variable is used to store the return values for both of the functions. There is no error handling if TpmMeasureAndLogDataWithFlags() returns an error Status. Fix the issue by adding error handling for TpmMeasureAndLogDataWithFlags(). Signed-off-by: Du Lin <du....@intel.com> Cc: Ashraf Ali S <ashraf.al...@intel.com> Cc: Chasel Chiu <chasel.c...@intel.com> Cc: Chen Gang C <gang.c.c...@intel.com> Cc: Duggapu Chinni B <chinni.b.dugg...@intel.com> Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> Cc: Star Zeng <star.z...@intel.com> Cc: Susovan Mohapatra <susovan.mohapa...@intel.com> Cc: Ted Kuo <ted....@intel.com> --- .../Library/BaseFspMeasurementLib/FspMeasurementLib.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/FspMeasurementLib.c b/IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/FspMeasurementLib.c index 2c017a4250..228277649b 100644 --- a/IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/FspMeasurementLib.c +++ b/IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/FspMeasurementLi +++ b.c @@ -197,6 +197,10 @@ MeasureFspFirmwareBlobWithCfg ( (UINTN)sizeof (DigestList), EDKII_TCG_PRE_HASH_LOG_ONLY ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "TpmMeasureAndLogDataWithFlags failed - %r\n", Status)); + return Status; + } Status = TpmMeasureAndLogData ( 1, -- 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116700): https://edk2.groups.io/g/devel/message/116700 Mute This Topic: https://groups.io/mt/104886875/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
