From: xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 4 Mar 2010 06:38:22 +0000 (+0000)
Subject: Add array index check to avoid potential buffer overflow.
X-Git-Tag: edk2-stable201903~16157
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5bdfa4e58ad64cbc825d03397b15f5b2bcebda4e;p=mirror_edk2.git

Add array index check to avoid potential buffer overflow.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10179 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.c b/UefiCpuPkg/CpuDxe/CpuDxe.c
index e117b9ab56..457823d5cd 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.c
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.c
@@ -857,6 +857,7 @@ RefreshGcdMemoryAttributes (
   UINT32                              FirmwareVariableMtrrCount;
 
   FirmwareVariableMtrrCount = GetFirmwareVariableMtrrCount ();
+  ASSERT (FirmwareVariableMtrrCount <= MTRR_NUMBER_OF_VARIABLE_MTRR);
 
 //  mIsFlushingGCD = TRUE;
   mIsFlushingGCD = FALSE;
diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
index 3c3115c8a0..4e6878f282 100644
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
@@ -1156,6 +1156,8 @@ MtrrGetMemoryAttribute (
   // Go through the variable MTRR
   //
   VariableMtrrCount = GetVariableMtrrCount ();
+  ASSERT (VariableMtrrCount <= MTRR_NUMBER_OF_VARIABLE_MTRR);
+
   for (Index = 0; Index < VariableMtrrCount; Index++) {
     if (VariableMtrr[Index].Valid) {
       if (Address >= VariableMtrr[Index].BaseAddress &&
@@ -1189,6 +1191,8 @@ MtrrGetVariableMtrr (
   UINT32  VariableMtrrCount;
 
   VariableMtrrCount = GetVariableMtrrCount ();
+  ASSERT (VariableMtrrCount <= MTRR_NUMBER_OF_VARIABLE_MTRR);
+
   for (Index = 0; Index < VariableMtrrCount; Index++) {
     VariableSettings->Mtrr[Index].Base =
       AsmReadMsr64 (MTRR_LIB_IA32_VARIABLE_MTRR_BASE + (Index << 1));
@@ -1215,6 +1219,8 @@ MtrrSetVariableMtrrWorker (
   UINT32  VariableMtrrCount;
 
   VariableMtrrCount = GetVariableMtrrCount ();
+  ASSERT (VariableMtrrCount <= MTRR_NUMBER_OF_VARIABLE_MTRR);
+
   for (Index = 0; Index < VariableMtrrCount; Index++) {
     AsmWriteMsr64 (
       MTRR_LIB_IA32_VARIABLE_MTRR_BASE + (Index << 1),