tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-04-08 17:05:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/PiSmmCpuDxeSmm: Fix buffer overflow issue.

Browse Source 
The size for the array of mSmmMpSyncData->CpuData[] is 0 ~
mMaxNumberOfCpus -1. But current code may use
mSmmMpSyncData->CpuData[mMaxNumberOfCpus].

This patch fixed this issue.

Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Eric Dong <eric.dong@intel.com>
This commit is contained in:
Eric Dong 2019-12-23 14:37:28 +08:00 committed by mergify[bot]
parent a457823f27
commit 123b720eeb
1 changed files with 8 additions and 8 deletions

16
UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c

@ -137,7 +137,7 @@ ReleaseAllAPs (
{ {
UINTN Index; UINTN Index;
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = 0; Index < mMaxNumberOfCpus; Index++) {
if (IsPresentAp (Index)) { if (IsPresentAp (Index)) {
ReleaseSemaphore (mSmmMpSyncData->CpuData[Index].Run); ReleaseSemaphore (mSmmMpSyncData->CpuData[Index].Run);
} }
@ -170,7 +170,7 @@ AllCpusInSmmWithExceptions (
CpuData = mSmmMpSyncData->CpuData; CpuData = mSmmMpSyncData->CpuData;
ProcessorInfo = gSmmCpuPrivate->ProcessorInfo; ProcessorInfo = gSmmCpuPrivate->ProcessorInfo;
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = 0; Index < mMaxNumberOfCpus; Index++) {
if (!(*(CpuData[Index].Present)) && ProcessorInfo[Index].ProcessorId != INVALID_APIC_ID) { if (!(*(CpuData[Index].Present)) && ProcessorInfo[Index].ProcessorId != INVALID_APIC_ID) {
if (((Exceptions & ARRIVAL_EXCEPTION_DELAYED) != 0) && SmmCpuFeaturesGetSmmRegister (Index, SmmRegSmmDelayed) != 0) { if (((Exceptions & ARRIVAL_EXCEPTION_DELAYED) != 0) && SmmCpuFeaturesGetSmmRegister (Index, SmmRegSmmDelayed) != 0) {
continue; continue;
@ -305,7 +305,7 @@ SmmWaitForApArrival (
// //
// Send SMI IPIs to bring outside processors in // Send SMI IPIs to bring outside processors in
// //
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = 0; Index < mMaxNumberOfCpus; Index++) {
if (!(*(mSmmMpSyncData->CpuData[Index].Present)) && gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId != INVALID_APIC_ID) { if (!(*(mSmmMpSyncData->CpuData[Index].Present)) && gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId != INVALID_APIC_ID) {
SendSmiIpi ((UINT32)gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId); SendSmiIpi ((UINT32)gSmmCpuPrivate->ProcessorInfo[Index].ProcessorId);
} }
@ -361,7 +361,7 @@ WaitForAllAPsNotBusy (
{ {
UINTN Index; UINTN Index;
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = 0; Index < mMaxNumberOfCpus; Index++) {
// //
// Ignore BSP and APs which not call in SMM. // Ignore BSP and APs which not call in SMM.
// //
@ -617,7 +617,7 @@ BSPHandler (
// //
while (TRUE) { while (TRUE) {
PresentCount = 0; PresentCount = 0;
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = 0; Index < mMaxNumberOfCpus; Index++) {
if (*(mSmmMpSyncData->CpuData[Index].Present)) { if (*(mSmmMpSyncData->CpuData[Index].Present)) {
PresentCount ++; PresentCount ++;
} }
@ -1301,7 +1301,7 @@ InternalSmmStartupAllAPs (
} }
CpuCount = 0; CpuCount = 0;
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = 0; Index < mMaxNumberOfCpus; Index++) {
if (IsPresentAp (Index)) { if (IsPresentAp (Index)) {
CpuCount ++; CpuCount ++;
@ -1333,13 +1333,13 @@ InternalSmmStartupAllAPs (
// Here code always use AcquireSpinLock instead of AcquireSpinLockOrFail for not // Here code always use AcquireSpinLock instead of AcquireSpinLockOrFail for not
// block mode. // block mode.
// //
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = 0; Index < mMaxNumberOfCpus; Index++) {
if (IsPresentAp (Index)) { if (IsPresentAp (Index)) {
AcquireSpinLock (mSmmMpSyncData->CpuData[Index].Busy); AcquireSpinLock (mSmmMpSyncData->CpuData[Index].Busy);
} }
} }
for (Index = mMaxNumberOfCpus; Index-- > 0;) { for (Index = 0; Index < mMaxNumberOfCpus; Index++) {
if (IsPresentAp (Index)) { if (IsPresentAp (Index)) {
mSmmMpSyncData->CpuData[Index].Procedure = (EFI_AP_PROCEDURE2) Procedure; mSmmMpSyncData->CpuData[Index].Procedure = (EFI_AP_PROCEDURE2) Procedure;
mSmmMpSyncData->CpuData[Index].Parameter = ProcedureArguments; mSmmMpSyncData->CpuData[Index].Parameter = ProcedureArguments;