add security check

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

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index 5aba4315ce8792b165383542ad697ae5eea290d5..8f3ed5eb374d8baa6ce7523b69b871426644ab63 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -374,6 +374,8 @@ GatherDeviceInfo (
     for (Offset = PciIoDevice->SrIovCapabilityOffset + EFI_PCIE_CAPABILITY_ID_SRIOV_BAR0, BarIndex = 0;\r
          Offset <= PciIoDevice->SrIovCapabilityOffset + EFI_PCIE_CAPABILITY_ID_SRIOV_BAR5;\r
          BarIndex++) {\r
+\r
+      ASSERT (BarIndex < PCI_MAX_BAR);\r
       Offset = PciIovParseVfBar (PciIoDevice, Offset, BarIndex);\r
     }\r
   }\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
index 17c864029b3d1eec88e95b347993fd3f75a040ca..4fea0306872e2cf33614335fb2436c96df681815 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
@@ -1229,6 +1229,8 @@ ProgramBar (
   UINT64              Address;\r
   UINT32              Address32;\r
 \r
+  ASSERT (Node->Bar < PCI_MAX_BAR);\r
+\r
   //\r
   // Check VF BAR\r
   //\r
@@ -1249,7 +1251,6 @@ ProgramBar (
   //\r
   Node->PciDev->Allocated = TRUE;\r
 \r
-  ASSERT (Node->Bar < PCI_MAX_BAR);\r
   switch ((Node->PciDev->PciBar[Node->Bar]).BarType) {\r
 \r
   case PciBarTypeIo16:\r