* [edk2-devel] [PATCH v2] IntelFsp2WrapperPkg: Error handling of FspmWrapperInit() @ 2024-03-14 2:02 Du Lin 2024-03-14 2:52 ` Ni, Ray 0 siblings, 1 reply; 3+ messages in thread From: Du Lin @ 2024-03-14 2:02 UTC (permalink / raw) To: devel Cc: Du Lin, Ashraf Ali S, Chasel Chiu, Chen Gang C, Duggapu Chinni B, Nate DeSimone, Star Zeng, Susovan Mohapatra, Ted Kuo 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.lin@intel.com> Cc: Ashraf Ali S <ashraf.ali.s@intel.com> Cc: Chasel Chiu <chasel.chiu@intel.com> Cc: Chen Gang C <gang.c.chen@intel.com> Cc: Duggapu Chinni B <chinni.b.duggapu@intel.com> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com> Cc: Star Zeng <star.zeng@intel.com> Cc: Susovan Mohapatra <susovan.mohapatra@intel.com> Cc: Ted Kuo <ted.kuo@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 (#116723): https://edk2.groups.io/g/devel/message/116723 Mute This Topic: https://groups.io/mt/104919472/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=- ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [PATCH v2] IntelFsp2WrapperPkg: Error handling of FspmWrapperInit() 2024-03-14 2:02 [edk2-devel] [PATCH v2] IntelFsp2WrapperPkg: Error handling of FspmWrapperInit() Du Lin @ 2024-03-14 2:52 ` Ni, Ray 2024-03-14 6:44 ` Ashraf Ali S 0 siblings, 1 reply; 3+ messages in thread From: Ni, Ray @ 2024-03-14 2:52 UTC (permalink / raw) To: devel@edk2.groups.io, Lin, Du Cc: S, Ashraf Ali, Chiu, Chasel, Chen, Gang C, Duggapu, Chinni B, Desimone, Nathaniel L, Zeng, Star, Mohapatra, Susovan, Kuo, Ted Reviewed-by: Ray Ni <ray.ni@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.lin@intel.com>; S, Ashraf Ali <ashraf.ali.s@intel.com>; Chiu, > Chasel <chasel.chiu@intel.com>; Chen, Gang C <gang.c.chen@intel.com>; > Duggapu, Chinni B <chinni.b.duggapu@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>; > Mohapatra, Susovan <susovan.mohapatra@intel.com>; Kuo, Ted > <ted.kuo@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.lin@intel.com> > Cc: Ashraf Ali S <ashraf.ali.s@intel.com> > Cc: Chasel Chiu <chasel.chiu@intel.com> > Cc: Chen Gang C <gang.c.chen@intel.com> > Cc: Duggapu Chinni B <chinni.b.duggapu@intel.com> > Cc: Nate DeSimone <nathaniel.l.desimone@intel.com> > Cc: Star Zeng <star.zeng@intel.com> > Cc: Susovan Mohapatra <susovan.mohapatra@intel.com> > Cc: Ted Kuo <ted.kuo@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/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=- ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [PATCH v2] IntelFsp2WrapperPkg: Error handling of FspmWrapperInit() 2024-03-14 2:52 ` Ni, Ray @ 2024-03-14 6:44 ` Ashraf Ali S 0 siblings, 0 replies; 3+ messages in thread From: Ashraf Ali S @ 2024-03-14 6:44 UTC (permalink / raw) To: Ni, Ray, devel@edk2.groups.io, Lin, Du Cc: Chiu, Chasel, Chen, Gang C, Duggapu, Chinni B, Desimone, Nathaniel L, Zeng, Star, Mohapatra, Susovan, Kuo, Ted Reviewed-by: S, Ashraf Ali <ashraf.ali.s@intel.com> Thanks., S, Ashraf Ali -----Original Message----- From: Ni, Ray <ray.ni@intel.com> Sent: Thursday, March 14, 2024 8:22 AM To: devel@edk2.groups.io; Lin, Du <du.lin@intel.com> Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Chen, Gang C <gang.c.chen@intel.com>; Duggapu, Chinni B <chinni.b.duggapu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>; Mohapatra, Susovan <susovan.mohapatra@intel.com>; Kuo, Ted <ted.kuo@intel.com> Subject: RE: [edk2-devel] [PATCH v2] IntelFsp2WrapperPkg: Error handling of FspmWrapperInit() Reviewed-by: Ray Ni <ray.ni@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.lin@intel.com>; S, Ashraf Ali > <ashraf.ali.s@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Chen, > Gang C <gang.c.chen@intel.com>; Duggapu, Chinni B > <chinni.b.duggapu@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>; > Mohapatra, Susovan <susovan.mohapatra@intel.com>; Kuo, Ted > <ted.kuo@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.lin@intel.com> > Cc: Ashraf Ali S <ashraf.ali.s@intel.com> > Cc: Chasel Chiu <chasel.chiu@intel.com> > Cc: Chen Gang C <gang.c.chen@intel.com> > Cc: Duggapu Chinni B <chinni.b.duggapu@intel.com> > Cc: Nate DeSimone <nathaniel.l.desimone@intel.com> > Cc: Star Zeng <star.zeng@intel.com> > Cc: Susovan Mohapatra <susovan.mohapatra@intel.com> > Cc: Ted Kuo <ted.kuo@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 (#116733): https://edk2.groups.io/g/devel/message/116733 Mute This Topic: https://groups.io/mt/104919472/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=- ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-14 6:44 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-03-14 2:02 [edk2-devel] [PATCH v2] IntelFsp2WrapperPkg: Error handling of FspmWrapperInit() Du Lin 2024-03-14 2:52 ` Ni, Ray 2024-03-14 6:44 ` Ashraf Ali S
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox