MdeModulePkg: ImagePropertiesRecordLib: Consolidate Usage

Currently, there are multiple instances of code create image
records. ImagePropertiesRecordLib was created to only have
this code in one place. Update the lib to use additional
logic from the copy in MemoryProtection.c before converging
that code to use the lib.

Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Taylor Beebe <taylor.d.beebe@gmail.com>

Acked-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>

1 files changed, 63 insertions, 19 deletions

diff --git a/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.c b/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.c
index 763a8d65d5..3ac043f980 100644
--- a/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.c
+++ b/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.c
@@ -61,6 +61,39 @@ EfiSizeToPages (
 }

 

 /**

+  Frees the memory for each ImageRecordCodeSection within an ImageRecord

+  and removes the entries from the list. It does not free the ImageRecord

+  itself.

+

+  @param[in]  ImageRecord The ImageRecord in which to free code sections

+**/

+STATIC

+VOID

+FreeImageRecordCodeSections (

+  IMAGE_PROPERTIES_RECORD  *ImageRecord

+  )

+{

+  LIST_ENTRY                            *CodeSegmentListHead;

+  IMAGE_PROPERTIES_RECORD_CODE_SECTION  *ImageRecordCodeSection;

+

+  if (ImageRecord == NULL) {

+    return;

+  }

+

+  CodeSegmentListHead = &ImageRecord->CodeSegmentList;

+  while (!IsListEmpty (CodeSegmentListHead)) {

+    ImageRecordCodeSection = CR (

+                               CodeSegmentListHead->ForwardLink,

+                               IMAGE_PROPERTIES_RECORD_CODE_SECTION,

+                               Link,

+                               IMAGE_PROPERTIES_RECORD_CODE_SECTION_SIGNATURE

+                               );

+    RemoveEntryList (&ImageRecordCodeSection->Link);

+    FreePool (ImageRecordCodeSection);

+  }

+}

+

+/**

   Sort memory map entries based upon PhysicalStart from low to high.

 

   @param[in, out] MemoryMap       A pointer to the buffer in which firmware places

@@ -993,6 +1026,7 @@ CreateImagePropertiesRecord (
   UINT8                                 *Name;

   UINT32                                SectionAlignment;

   UINT32                                PeCoffHeaderOffset;

+  CHAR8                                 *PdbPointer;

 

   if ((ImageRecord == NULL) || (ImageBase == NULL)) {

     return EFI_INVALID_PARAMETER;

@@ -1016,6 +1050,11 @@ CreateImagePropertiesRecord (
   InitializeListHead (&ImageRecord->Link);

   InitializeListHead (&ImageRecord->CodeSegmentList);

 

+  PdbPointer = PeCoffLoaderGetPdbPointer ((VOID *)(UINTN)ImageBase);

+  if (PdbPointer != NULL) {

+    DEBUG ((DEBUG_ERROR, " Image - %a\n", PdbPointer));

+  }

+

   // Check PE/COFF image

   DosHdr             = (EFI_IMAGE_DOS_HEADER *)(UINTN)ImageBase;

   PeCoffHeaderOffset = 0;

@@ -1084,7 +1123,8 @@ CreateImagePropertiesRecord (
       // Record code section(s)

       ImageRecordCodeSection = AllocatePool (sizeof (*ImageRecordCodeSection));

       if (ImageRecordCodeSection == NULL) {

-        return EFI_OUT_OF_RESOURCES;

+        Status = EFI_OUT_OF_RESOURCES;

+        goto CreateImagePropertiesRecordEnd;

       }

 

       ImageRecordCodeSection->Signature = IMAGE_PROPERTIES_RECORD_CODE_SECTION_SIGNATURE;

@@ -1103,6 +1143,27 @@ CreateImagePropertiesRecord (
     SortImageRecordCodeSection (ImageRecord);

   }

 

+  //

+  // Check overlap all section in ImageBase/Size

+  //

+  if (!IsImageRecordCodeSectionValid (ImageRecord)) {

+    DEBUG ((DEBUG_ERROR, "IsImageRecordCodeSectionValid - FAIL\n"));

+    Status = EFI_INVALID_PARAMETER;

+    goto CreateImagePropertiesRecordEnd;

+  }

+

+  //

+  // Round up the ImageSize, some CPU arch may return EFI_UNSUPPORTED if ImageSize is not aligned.

+  // Given that the loader always allocates full pages, we know the space after the image is not used.

+  //

+  ImageRecord->ImageSize = ALIGN_VALUE (ImageRecord->ImageSize, EFI_PAGE_SIZE);

+

+CreateImagePropertiesRecordEnd:

+  if (EFI_ERROR (Status)) {

+    // we failed to create a valid record, free the section memory that was allocated

+    FreeImageRecordCodeSections (ImageRecord);

+  }

+

   return Status;

 }

 

@@ -1119,24 +1180,7 @@ DeleteImagePropertiesRecord (
   IN  IMAGE_PROPERTIES_RECORD  *ImageRecord

   )

 {

-  LIST_ENTRY                            *CodeSegmentListHead;

-  IMAGE_PROPERTIES_RECORD_CODE_SECTION  *ImageRecordCodeSection;

-

-  if (ImageRecord == NULL) {

-    return;

-  }

-

-  CodeSegmentListHead = &ImageRecord->CodeSegmentList;

-  while (!IsListEmpty (CodeSegmentListHead)) {

-    ImageRecordCodeSection = CR (

-                               CodeSegmentListHead->ForwardLink,

-                               IMAGE_PROPERTIES_RECORD_CODE_SECTION,

-                               Link,

-                               IMAGE_PROPERTIES_RECORD_CODE_SECTION_SIGNATURE

-                               );

-    RemoveEntryList (&ImageRecordCodeSection->Link);

-    FreePool (ImageRecordCodeSection);

-  }

+  FreeImageRecordCodeSections (ImageRecord);

 

   if (!IsListEmpty (&ImageRecord->Link)) {

     RemoveEntryList (&ImageRecord->Link);