Reviewed-by: Ray Ni <ray...@intel.com> Thanks, Ray > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Du Lin > Sent: Thursday, March 14, 2024 10:02 AM > 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: [edk2-devel] [PATCH v2] IntelFsp2WrapperPkg: Error handling of > FspmWrapperInit() > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4701 > > The error handling of FspmWrapperInit() is limited to ASSERT > statements only, which only works in debug builds, but not in > release builds. > Fix the issue by enhancing the error handling of FspmWrapperInit() > to cover both debug builds and release builds. > > 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> > --- > IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c | 8 > ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > index ba0c742fea..7f1deb9542 100644 > --- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > +++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > @@ -197,12 +197,20 @@ FspmWrapperInit ( > > MeasurementExcludedFvPpi = AllocatePool (sizeof > (*MeasurementExcludedFvPpi)); > ASSERT (MeasurementExcludedFvPpi != NULL); > + if (MeasurementExcludedFvPpi == NULL) { > + return EFI_OUT_OF_RESOURCES; > + } > + > MeasurementExcludedFvPpi->Count = 1; > MeasurementExcludedFvPpi->Fv[0].FvBase = PcdGet32 > (PcdFspmBaseAddress); > MeasurementExcludedFvPpi->Fv[0].FvLength = > ((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 > (PcdFspmBaseAddress))->FvLength; > > MeasurementExcludedPpiList = AllocatePool (sizeof > (*MeasurementExcludedPpiList)); > ASSERT (MeasurementExcludedPpiList != NULL); > + if (MeasurementExcludedPpiList == NULL) { > + return EFI_OUT_OF_RESOURCES; > + } > + > MeasurementExcludedPpiList->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI | > EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST; > MeasurementExcludedPpiList->Guid = > &gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid; > MeasurementExcludedPpiList->Ppi = MeasurementExcludedFvPpi; > -- > 2.44.0.windows.1 > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116726): https://edk2.groups.io/g/devel/message/116726 Mute This Topic: https://groups.io/mt/104919472/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
