Reviewed-by: Michael D Kinney <michael.d.kin...@intel.com>
> -----Original Message----- > From: mikub...@linux.microsoft.com <mikub...@linux.microsoft.com> > Sent: Friday, March 24, 2023 1:49 PM > To: devel@edk2.groups.io > Cc: Dong, Eric <eric.d...@intel.com>; Erich McMillan > <emcmil...@microsoft.com>; Kinney, Michael D <michael.d.kin...@intel.com>; > Michael Kubacki <mikub...@linux.microsoft.com>; Kumar, Rahul R > <rahul.r.ku...@intel.com>; Ni, Ray <ray...@intel.com> > Subject: [PATCH v6 10/12] UefiCpuPkg: Fix conditionally uninitialized > variables > > From: Michael Kubacki <michael.kuba...@microsoft.com> > > Fixes CodeQL alerts for CWE-457: > https://cwe.mitre.org/data/definitions/457.html > > Cc: Eric Dong <eric.d...@intel.com> > Cc: Erich McMillan <emcmil...@microsoft.com> > Cc: Michael D Kinney <michael.d.kin...@intel.com> > Cc: Michael Kubacki <mikub...@linux.microsoft.com> > Cc: Rahul Kumar <rahul1.ku...@intel.com> > Cc: Ray Ni <ray...@intel.com> > Co-authored-by: Erich McMillan <emcmil...@microsoft.com> > Signed-off-by: Michael Kubacki <michael.kuba...@microsoft.com> > --- > UefiCpuPkg/CpuMpPei/CpuBist.c | 8 +++++++- > UefiCpuPkg/CpuMpPei/CpuMpPei.c | 8 +++++++- > UefiCpuPkg/CpuMpPei/CpuPaging.c | 9 ++++++++- > 3 files changed, 22 insertions(+), 3 deletions(-) > > diff --git a/UefiCpuPkg/CpuMpPei/CpuBist.c b/UefiCpuPkg/CpuMpPei/CpuBist.c > index 7dc93cd784d4..78e008703993 100644 > --- a/UefiCpuPkg/CpuMpPei/CpuBist.c > +++ b/UefiCpuPkg/CpuMpPei/CpuBist.c > @@ -175,7 +175,13 @@ CollectBistDataFromPpi ( > EFI_SEC_PLATFORM_INFORMATION_RECORD2 *PlatformInformationRecord2; > EFI_SEC_PLATFORM_INFORMATION_CPU *CpuInstanceInHob; > > - MpInitLibGetNumberOfProcessors (&NumberOfProcessors, > &NumberOfEnabledProcessors); > + Status = MpInitLibGetNumberOfProcessors (&NumberOfProcessors, > &NumberOfEnabledProcessors); > + ASSERT_EFI_ERROR (Status); > + > + if (EFI_ERROR (Status)) { > + NumberOfProcessors = 1; > + NumberOfEnabledProcessors = 1; > + } > > BistInformationSize = sizeof (EFI_SEC_PLATFORM_INFORMATION_RECORD2) + > sizeof (EFI_SEC_PLATFORM_INFORMATION_CPU) * > NumberOfProcessors; > diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/CpuMpPei.c > index e7f1fe9f426c..b504bea3cfeb 100644 > --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c > +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.c > @@ -473,7 +473,13 @@ InitializeMpExceptionStackSwitchHandlers ( > return; > } > > - MpInitLibGetNumberOfProcessors (&NumberOfProcessors, NULL); > + Status = MpInitLibGetNumberOfProcessors (&NumberOfProcessors, NULL); > + ASSERT_EFI_ERROR (Status); > + > + if (EFI_ERROR (Status)) { > + NumberOfProcessors = 1; > + } > + > SwitchStackData = AllocatePages (EFI_SIZE_TO_PAGES (NumberOfProcessors * > sizeof (EXCEPTION_STACK_SWITCH_CONTEXT))); > ASSERT (SwitchStackData != NULL); > ZeroMem (SwitchStackData, NumberOfProcessors * sizeof > (EXCEPTION_STACK_SWITCH_CONTEXT)); > diff --git a/UefiCpuPkg/CpuMpPei/CpuPaging.c b/UefiCpuPkg/CpuMpPei/CpuPaging.c > index 135422225340..a471f089c8ae 100644 > --- a/UefiCpuPkg/CpuMpPei/CpuPaging.c > +++ b/UefiCpuPkg/CpuMpPei/CpuPaging.c > @@ -538,6 +538,7 @@ SetupStackGuardPage ( > UINTN NumberOfProcessors; > UINTN Bsp; > UINTN Index; > + EFI_STATUS Status; > > // > // One extra page at the bottom of the stack is needed for Guard page. > @@ -547,7 +548,13 @@ SetupStackGuardPage ( > ASSERT (FALSE); > } > > - MpInitLibGetNumberOfProcessors (&NumberOfProcessors, NULL); > + Status = MpInitLibGetNumberOfProcessors (&NumberOfProcessors, NULL); > + ASSERT_EFI_ERROR (Status); > + > + if (EFI_ERROR (Status)) { > + NumberOfProcessors = 1; > + } > + > MpInitLibWhoAmI (&Bsp); > for (Index = 0; Index < NumberOfProcessors; ++Index) { > StackBase = 0; > -- > 2.40.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#101840): https://edk2.groups.io/g/devel/message/101840 Mute This Topic: https://groups.io/mt/97832911/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
