Changeset 41162 in vbox for trunk/src/VBox/Devices

Timestamp:

May 4, 2012 12:09:51 PM (13 years ago)

Author:

vboxsync

Message:

EFI: EP calculation fix (xTracker/6187).

File:

• trunk/src/VBox/Devices/EFI/DevEFI.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -571 +571 @@
         {
             *pcbFile = FFS_SIZE(pFfsFile);
+            LogFunc(("Found %RTuuid of type:%d\n", &pFfsFile->Name, FileType));
             return pFfsFile;
         }
@@ -578 +579 @@
 }
 
-static int efiFindEntryPoint(EFI_FFS_FILE_HEADER const *pFfsFile, uint32_t cbFfsFile, RTGCPHYS *pImageBase, uint8_t **ppbImage)
+static int efiFindRelativeAddressOfEPAndBaseAddressOfModule(EFI_FFS_FILE_HEADER const *pFfsFile, uint32_t cbFfsFile, RTGCPHYS *pImageBase, uint8_t **ppbImage)
 {
     /*
@@ -637 +638 @@
                               ("%x / %x\n", pHdr->Nt32.FileHeader.Machine, pHdr->Nt32.FileHeader.SizeOfOptionalHeader),
                               VERR_LDR_ARCH_MISMATCH);
+        EFI_IMAGE_SECTION_HEADER *pSectionsHeaders = NULL;
+        int cSectionsHeaders = 0;
         if (pHdr->Nt32.FileHeader.Machine == EFI_IMAGE_FILE_MACHINE_I386)
         {
@@ -645 +648 @@
             ImageBase = pHdr->Nt32.OptionalHeader.ImageBase;
             EpRVA     = pHdr->Nt32.OptionalHeader.AddressOfEntryPoint;
+            EpRVA     -= pHdr->Nt32.OptionalHeader.BaseOfCode;
             AssertLogRelMsgReturn(EpRVA < pHdr->Nt32.OptionalHeader.SizeOfImage,
                                   ("%#RGp / %#x\n", EpRVA, pHdr->Nt32.OptionalHeader.SizeOfImage),
                                   VERR_BAD_EXE_FORMAT);
+            pSectionsHeaders = (EFI_IMAGE_SECTION_HEADER *)((uint8_t *)&pHdr->Nt32.OptionalHeader + pHdr->Nt32.FileHeader.SizeOfOptionalHeader);
+            cSectionsHeaders = pHdr->Nt32.FileHeader.NumberOfSections;
         }
         else
         {
-            Log2(("EFI: PE+/AMD64\n"));
+            Log2(("EFI: PE+/AMD64 %RX16\n", pHdr->Nt32.FileHeader.Machine));
             AssertLogRelMsgReturn(pHdr->Nt64.OptionalHeader.SizeOfImage < cbFfsFile,
                                   ("%#x / %#x\n", pHdr->Nt64.OptionalHeader.SizeOfImage, cbFfsFile),
@@ -657 +663 @@
             ImageBase = pHdr->Nt64.OptionalHeader.ImageBase;
             EpRVA     = pHdr->Nt64.OptionalHeader.AddressOfEntryPoint;
+            EpRVA     -= pHdr->Nt64.OptionalHeader.BaseOfCode;
             AssertLogRelMsgReturn(EpRVA < pHdr->Nt64.OptionalHeader.SizeOfImage,
                                   ("%#RGp / %#x\n", EpRVA, pHdr->Nt64.OptionalHeader.SizeOfImage),
                                   VERR_BAD_EXE_FORMAT);
+            pSectionsHeaders = (EFI_IMAGE_SECTION_HEADER *)((uint8_t *)&pHdr->Nt64.OptionalHeader + pHdr->Nt64.FileHeader.SizeOfOptionalHeader);
+            cSectionsHeaders = pHdr->Nt64.FileHeader.NumberOfSections;
+        }
+        AssertPtrReturn(pSectionsHeaders, VERR_BAD_EXE_FORMAT);
+        int idxSection = 0;
+        for (; idxSection < cSectionsHeaders; ++idxSection)
+        {
+            EFI_IMAGE_SECTION_HEADER *pSection = &pSectionsHeaders[idxSection];
+            if (!RTStrCmp((const char *)&pSection->Name[0], ".text"))
+            {
+                EpRVA += pSection->PointerToRawData;
+                break;
+            }
         }
     }
@@ -684 +704 @@
     if (ppbImage != NULL)
         *ppbImage = (uint8_t *)pbImage;
-    return ImageBase + EpRVA;
+    return (EpRVA);
 }
 
@@ -728 +748 @@
     AssertLogRelMsgReturn(pFfsFile, ("No SECURITY_CORE found in the firmware volume\n"), VERR_FILE_NOT_FOUND);
 
-    RTGCPHYS ImageBase;
-    uint8_t *pbImage;
-    pThis->GCEntryPoint0 = efiFindEntryPoint(pFfsFile, cbFfsFile, &ImageBase, &pbImage);
-
+    RTGCPHYS ImageBase = NULL;
+    uint8_t *pbImage = NULL;
+    pThis->GCEntryPoint0 = efiFindRelativeAddressOfEPAndBaseAddressOfModule(pFfsFile, cbFfsFile, &ImageBase, &pbImage);
+    pThis->GCEntryPoint0 += pbImage - pThis->pu8EfiRom;
+    Assert(pThis->pu8EfiRom <= pbImage);
+    Assert(pbImage < pThis->pu8EfiRom + pThis->cbEfiRom);
     /*
      * Calc the firmware load address from the image base and validate it.
      */
     pThis->GCLoadAddress = ImageBase - (pbImage - pThis->pu8EfiRom);
+    pThis->GCEntryPoint0 += pThis->GCLoadAddress;
     AssertLogRelMsgReturn(~(pThis->GCLoadAddress & PAGE_OFFSET_MASK),
                           ("%RGp\n", pThis->GCLoadAddress),
@@ -751 +774 @@
 
     pFfsFile = efiFwVolFindFileByType(pFfsFile, pbFwVolEnd, EFI_FV_FILETYPE_PEI_CORE, &cbFfsFile);
-    pThis->GCEntryPoint1 = efiFindEntryPoint(pFfsFile, cbFfsFile, NULL, NULL);
+    pThis->GCEntryPoint1 = efiFindRelativeAddressOfEPAndBaseAddressOfModule(pFfsFile, cbFfsFile, NULL, &pbImage);
+    pThis->GCEntryPoint1 += pThis->GCLoadAddress;
+    pThis->GCEntryPoint1 += pbImage - pThis->pu8EfiRom;
     LogRel(("EFI: Firmware volume loading at %RGp, PEI CORE at with EP at %RGp\n",
             pThis->GCLoadAddress, pThis->GCEntryPoint1));
@@ -805 +830 @@
                               PGMPHYS_ROM_FLAGS_SHADOWED | PGMPHYS_ROM_FLAGS_PERMANENT_BINARY,
                               "EFI Firmware Volume");
-    if (RT_FAILURE(rc))
-        return rc;
+    AssertRCReturn(rc, rc);
+    rc = PDMDevHlpROMProtectShadow(pThis->pDevIns, pThis->GCLoadAddress, (uint32_t)cbQuart, PGMROMPROT_READ_RAM_WRITE_IGNORE);
+    AssertRCReturn(rc, rc);
     rc = PDMDevHlpROMRegister(pThis->pDevIns,
                               pThis->GCLoadAddress + cbQuart,