BaseTools CommonLib: Fix printf %llx issue on UINT64

[mirror_edk2.git] / BaseTools / Source / C / GenFw / Elf64Convert.c

diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
index 708c1a1d91a727bcab04117f9c86bb97a155ada3..c39bdff063ab4cecbd6bb49c16fe32a22e9b5de6 100644 (file)
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
@@ -1,7 +1,7 @@
 /** @file\r
 Elf64 convert solution\r
 \r
-Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
 Portions copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials are licensed and made available\r
@@ -21,7 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <io.h>\r
 #endif\r
 #include <assert.h>\r
-#include <stdbool.h>\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
@@ -172,6 +171,10 @@ InitializeElf64 (
   //\r
   VerboseMsg ("Create COFF Section Offset Buffer");\r
   mCoffSectionsOffset = (UINT32 *)malloc(mEhdr->e_shnum * sizeof (UINT32));\r
+  if (mCoffSectionsOffset == NULL) {\r
+    Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");\r
+    return FALSE;\r
+  }\r
   memset(mCoffSectionsOffset, 0, mEhdr->e_shnum * sizeof(UINT32));\r
 \r
   //\r
@@ -292,23 +295,27 @@ GetSymName (
   Elf_Sym *Sym\r
   )\r
 {\r
+  Elf_Shdr *StrtabShdr;\r
+  UINT8    *StrtabContents;\r
+  BOOLEAN  foundEnd;\r
+  UINT32   i;\r
+\r
   if (Sym->st_name == 0) {\r
     return NULL;\r
   }\r
 \r
-  Elf_Shdr *StrtabShdr = FindStrtabShdr();\r
+  StrtabShdr = FindStrtabShdr();\r
   if (StrtabShdr == NULL) {\r
     return NULL;\r
   }\r
 \r
   assert(Sym->st_name < StrtabShdr->sh_size);\r
 \r
-  UINT8* StrtabContents = (UINT8*)mEhdr + StrtabShdr->sh_offset;\r
+  StrtabContents = (UINT8*)mEhdr + StrtabShdr->sh_offset;\r
 \r
-  bool foundEnd = false;\r
-  UINT32 i;\r
+  foundEnd = FALSE;\r
   for (i= Sym->st_name; (i < StrtabShdr->sh_size) && !foundEnd; i++) {\r
-    foundEnd = StrtabContents[i] == 0;\r
+    foundEnd = (BOOLEAN)(StrtabContents[i] == 0);\r
   }\r
   assert(foundEnd);\r
 \r
@@ -518,6 +525,10 @@ ScanSections64 (
   // Allocate base Coff file.  Will be expanded later for relocations.\r
   //\r
   mCoffFile = (UINT8 *)malloc(mCoffOffset);\r
+  if (mCoffFile == NULL) {\r
+    Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");\r
+  }\r
+  assert (mCoffFile != NULL);\r
   memset(mCoffFile, 0, mCoffOffset);\r
 \r
   //\r
@@ -682,6 +693,20 @@ WriteSections64 (
       continue;\r
     }\r
 \r
+    //\r
+    // If this is a ET_DYN (PIE) executable, we will encounter a dynamic SHT_RELA\r
+    // section that applies to the entire binary, and which will have its section\r
+    // index set to #0 (which is a NULL section with the SHF_ALLOC bit cleared).\r
+    //\r
+    // In the absence of GOT based relocations (which we currently don't support),\r
+    // this RELA section will contain redundant R_xxx_RELATIVE relocations, one\r
+    // for every R_xxx_xx64 relocation appearing in the per-section RELA sections.\r
+    // (i.e., .rela.text and .rela.data)\r
+    //\r
+    if (RelShdr->sh_info == 0) {\r
+      continue;\r
+    }\r
+\r
     //\r
     // Relocation section found.  Now extract section information that the relocations\r
     // apply to in the ELF data and the new COFF data.\r
@@ -1070,7 +1095,7 @@ WriteDebug64 (
   NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);\r
   DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG];\r
   DataDir->VirtualAddress = mDebugOffset;\r
-  DataDir->Size = Dir->SizeOfData + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);\r
+  DataDir->Size = sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);\r
 }\r
 \r
 STATIC\r