Improve robustness when scanning PCI Option ROM.

Signed-off-by: rsun3
Reviewed-by: geekboy15a


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

4 files changed, 90 insertions, 31 deletions

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c
index f1af10399..28adb2bf2 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2005 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -155,6 +155,7 @@ Returns:
   PCI_DATA_STRUCTURE        *RomPcir;

   UINT64                    RomSize;

   UINT64                    RomImageSize;

+  UINT32                    LegacyImageLength;

   UINT8                     *RomInMemory;

   UINT8                     CodeType;

 

@@ -207,6 +208,7 @@ Returns:
   RomBarOffset  = RomBar;

   retStatus     = EFI_NOT_FOUND;

   FirstCheck    = TRUE;

+  LegacyImageLength = 0;

 

   do {

     PciDevice->PciRootBridgeIo->Mem.Read (

@@ -229,6 +231,15 @@ Returns:
 

     FirstCheck  = FALSE;

     OffsetPcir  = RomHeader->PcirOffset;

+    //

+    // If the pointer to the PCI Data Structure is invalid, no further images can be located. 

+    // The PCI Data Structure must be DWORD aligned. 

+    //

+    if (OffsetPcir == 0 ||

+       (OffsetPcir & 3) != 0 ||

+       RomImageSize + OffsetPcir + sizeof (PCI_DATA_STRUCTURE) > RomSize) {

+      break;

+    }

     PciDevice->PciRootBridgeIo->Mem.Read (

                                       PciDevice->PciRootBridgeIo,

                                       EfiPciWidthUint8,

@@ -236,8 +247,18 @@ Returns:
                                       sizeof (PCI_DATA_STRUCTURE),

                                       (UINT8 *) RomPcir

                                       );

+    //

+    // If a valid signature is not present in the PCI Data Structure, no further images can be located.

+    //

+    if (RomPcir->Signature != PCI_DATA_STRUCTURE_SIGNATURE) {

+      break;

+    }

+    if (RomImageSize + RomPcir->ImageLength * 512 > RomSize) {

+      break;

+    }

     if (RomPcir->CodeType == PCI_CODE_TYPE_PCAT_IMAGE) {

       CodeType = PCI_CODE_TYPE_PCAT_IMAGE;

+      LegacyImageLength = ((UINT32)((EFI_LEGACY_EXPANSION_ROM_HEADER *)RomHeader)->Size512) * 512;

     }

     Indicator     = RomPcir->Indicator;

     RomImageSize  = RomImageSize + RomPcir->ImageLength * 512;

@@ -249,7 +270,7 @@ Returns:
   // of the legacy length and the PCIR Image Length

   //

   if (CodeType == PCI_CODE_TYPE_PCAT_IMAGE) {

-    RomImageSize = MAX(RomImageSize, (((EFI_LEGACY_EXPANSION_ROM_HEADER *)RomHeader)->Size512 * 512));

+    RomImageSize = MAX (RomImageSize, LegacyImageLength);

   }

 

   if (RomImageSize > 0) {

@@ -399,7 +420,6 @@ Returns:
   EFI_HANDLE                    ImageHandle;

   EFI_STATUS                    Status;

   EFI_STATUS                    retStatus;

-  BOOLEAN                       FirstCheck;

   BOOLEAN                       SkipImage;

   UINT32                        DestinationSize;

   UINT32                        ScratchSize;

@@ -410,6 +430,7 @@ Returns:
   EFI_DECOMPRESS_PROTOCOL       *Decompress;

   EFI_PCI_EXPANSION_ROM_HEADER  *EfiRomHeader;

   PCI_DATA_STRUCTURE            *Pcir;

+  UINT32                        InitializationSize;

 

   Indicator = 0;

 

@@ -419,35 +440,36 @@ Returns:
   RomBar        = PciDevice->PciIo.RomImage;

   RomBarOffset  = (UINT8 *) RomBar;

   retStatus     = EFI_NOT_FOUND;

-  FirstCheck    = TRUE;

+

+  if (RomBarOffset == NULL) {

+    return retStatus;

+  }

+  ASSERT (((EFI_PCI_EXPANSION_ROM_HEADER *) RomBarOffset)->Signature == PCI_EXPANSION_ROM_HEADER_SIGNATURE);

 

   do {

     EfiRomHeader = (EFI_PCI_EXPANSION_ROM_HEADER *) RomBarOffset;

     if (EfiRomHeader->Signature != PCI_EXPANSION_ROM_HEADER_SIGNATURE) {

       RomBarOffset = RomBarOffset + 512;

-      if (FirstCheck) {

-        break;

-      } else {

-        continue;

-      }

+      continue;

     }

 

-    FirstCheck  = FALSE;

     Pcir        = (PCI_DATA_STRUCTURE *) (RomBarOffset + EfiRomHeader->PcirOffset);

+    ASSERT (Pcir->Signature == PCI_DATA_STRUCTURE_SIGNATURE);

     ImageSize   = (UINT32) (Pcir->ImageLength * 512);

     Indicator   = Pcir->Indicator;

 

-    if ((Pcir->CodeType == PCI_CODE_TYPE_EFI_IMAGE) && 

-        (EfiRomHeader->EfiSignature == EFI_PCI_EXPANSION_ROM_HEADER_EFISIGNATURE)) {

+    if ((Pcir->CodeType == PCI_CODE_TYPE_EFI_IMAGE) &&

+        (EfiRomHeader->EfiSignature == EFI_PCI_EXPANSION_ROM_HEADER_EFISIGNATURE) &&

+        ((EfiRomHeader->EfiSubsystem == EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER) ||

+         (EfiRomHeader->EfiSubsystem == EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER))) {

 

-      if ((EfiRomHeader->EfiSubsystem == EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER)  ||

-          (EfiRomHeader->EfiSubsystem == EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER)) {

+      ImageOffset             = EfiRomHeader->EfiImageHeaderOffset;

+      InitializationSize      = EfiRomHeader->InitializationSize * 512;

 

-        ImageOffset             = EfiRomHeader->EfiImageHeaderOffset;

-        ImageSize               = (UINT32) (EfiRomHeader->InitializationSize * 512);

+      if (InitializationSize <= ImageSize && ImageOffset < InitializationSize) {

 

         ImageBuffer             = (VOID *) (RomBarOffset + ImageOffset);

-        ImageLength             = ImageSize - (UINT32)ImageOffset;

+        ImageLength             =  InitializationSize - (UINT32)ImageOffset;

         DecompressedImageBuffer = NULL;

 

         //

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
index ed868e2ea..5085431b0 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2005 - 2007, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -133,6 +133,7 @@ Returns:
   VOID                          *DecompressedImageBuffer;

   UINT32                        ImageLength;

   EFI_DECOMPRESS_PROTOCOL       *Decompress;

+  UINT32                        InitializationSize;

 

   RomBar = (VOID *) (UINTN) PciOptionRomDescriptor->RomAddress;

   RomSize = (UINTN) PciOptionRomDescriptor->RomLength;

@@ -151,24 +152,44 @@ Returns:
 

     EfiRomHeader = (EFI_PCI_EXPANSION_ROM_HEADER *) (UINTN) RomBarOffset;

 

-    if (EfiRomHeader->Signature != 0xaa55) {

+

+    if (EfiRomHeader->Signature != PCI_EXPANSION_ROM_HEADER_SIGNATURE) {

       return retStatus;

     }

 

+    //

+    // If the pointer to the PCI Data Structure is invalid, no further images can be located. 

+    // The PCI Data Structure must be DWORD aligned. 

+    //

+    if (EfiRomHeader->PcirOffset == 0 ||

+        (EfiRomHeader->PcirOffset & 3) != 0 ||

+        RomBarOffset - (UINTN)RomBar + EfiRomHeader->PcirOffset + sizeof (PCI_DATA_STRUCTURE) > RomSize) {

+      break;

+    }

     Pcir      = (PCI_DATA_STRUCTURE *) (UINTN) (RomBarOffset + EfiRomHeader->PcirOffset);

+    //

+    // If a valid signature is not present in the PCI Data Structure, no further images can be located.

+    //

+    if (Pcir->Signature != PCI_DATA_STRUCTURE_SIGNATURE) {

+      break;

+    }

     ImageSize = Pcir->ImageLength * 512;

+    if (RomBarOffset - (UINTN)RomBar + ImageSize > RomSize) {

+      break;

+    }

 

     if ((Pcir->CodeType == PCI_CODE_TYPE_EFI_IMAGE) &&

-        (EfiRomHeader->EfiSignature == EFI_PCI_EXPANSION_ROM_HEADER_EFISIGNATURE) ) {

+        (EfiRomHeader->EfiSignature == EFI_PCI_EXPANSION_ROM_HEADER_EFISIGNATURE) &&

+        ((EfiRomHeader->EfiSubsystem == EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER) ||

+         (EfiRomHeader->EfiSubsystem == EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER))) {

 

-      if ((EfiRomHeader->EfiSubsystem == EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER) ||

-          (EfiRomHeader->EfiSubsystem == EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER) ) {

+      ImageOffset             = EfiRomHeader->EfiImageHeaderOffset;

+      InitializationSize      = EfiRomHeader->InitializationSize * 512;

 

-        ImageOffset             = EfiRomHeader->EfiImageHeaderOffset;

-        ImageSize               = EfiRomHeader->InitializationSize * 512;

+      if (InitializationSize <= ImageSize && ImageOffset < InitializationSize) {

 

         ImageBuffer             = (VOID *) (UINTN) (RomBarOffset + ImageOffset);

-        ImageLength             = ImageSize - ImageOffset;

+        ImageLength             = InitializationSize - ImageOffset;

         DecompressedImageBuffer = NULL;

 

         //

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
index 7395ce2d8..fbfc2fade 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2005 - 2008, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -436,8 +436,10 @@ CheckForRom (
 

           Pcir.ImageLength = 0;

 

-          if (EfiRomHeader.Signature == 0xaa55) {

-

+          if (EfiRomHeader.Signature == PCI_EXPANSION_ROM_HEADER_SIGNATURE &&

+              EfiRomHeader.PcirOffset != 0 &&

+              (EfiRomHeader.PcirOffset & 3) == 0 &&

+              RomBarSize + EfiRomHeader.PcirOffset + sizeof (PCI_DATA_STRUCTURE) <= MaxRomSize) {

             ZeroMem (&Pcir, sizeof(Pcir));

             IoDev->Mem.Read (

               IoDev, 

@@ -447,6 +449,12 @@ CheckForRom (
               &Pcir

               );

 

+            if (Pcir.Signature != PCI_DATA_STRUCTURE_SIGNATURE) {

+              break;

+            }

+            if (RomBarSize + Pcir.ImageLength * 512 > MaxRomSize) {

+              break;

+            }

             if ((Pcir.Indicator & 0x80) == 0x00) {

               LastImage = FALSE;

             }

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
index 5320f560d..1e4c21803 100644
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2005 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -436,8 +436,10 @@ CheckForRom (
 

           Pcir.ImageLength = 0;

 

-          if (EfiRomHeader.Signature == 0xaa55) {

-

+          if (EfiRomHeader.Signature == PCI_EXPANSION_ROM_HEADER_SIGNATURE &&

+              EfiRomHeader.PcirOffset != 0 &&

+              (EfiRomHeader.PcirOffset & 3) == 0 &&

+              RomBarSize + EfiRomHeader.PcirOffset + sizeof (PCI_DATA_STRUCTURE) <= MaxRomSize) {

             ZeroMem (&Pcir, sizeof(Pcir));

             IoDev->Mem.Read (

               IoDev, 

@@ -447,6 +449,12 @@ CheckForRom (
               &Pcir

               );

 

+            if (Pcir.Signature != PCI_DATA_STRUCTURE_SIGNATURE) {

+              break;

+            }

+            if (RomBarSize + Pcir.ImageLength * 512 > MaxRomSize) {

+              break;

+            }

             if ((Pcir.Indicator & 0x80) == 0x00) {

               LastImage = FALSE;

             }