BaseTools/GenFw: Avoid possible NULL pointer dereference

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

4 files changed, 39 insertions, 4 deletions

diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c b/BaseTools/Source/C/GenFw/Elf32Convert.c
index 8fca7fba2a..f420bc89da 100644
--- a/BaseTools/Source/C/GenFw/Elf32Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf32Convert.c
@@ -167,6 +167,10 @@ InitializeElf32 (
   // Create COFF Section offset buffer and zero.

   //

   mCoffSectionsOffset = (UINT32 *)malloc(mEhdr->e_shnum * sizeof (UINT32));

+  if (mCoffSectionsOffset == NULL) {

+    Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");

+    return FALSE;

+  }

   memset(mCoffSectionsOffset, 0, mEhdr->e_shnum * sizeof(UINT32));

 

   //

@@ -526,6 +530,10 @@ ScanSections32 (
   // Allocate base Coff file.  Will be expanded later for relocations.

   //

   mCoffFile = (UINT8 *)malloc(mCoffOffset);

+  if (mCoffFile == NULL) {

+    Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");

+  }

+  assert (mCoffFile != NULL);

   memset(mCoffFile, 0, mCoffOffset);

 

   //

diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
index 9b409b615e..acf021667e 100644
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
@@ -1,7 +1,7 @@
 /** @file

 Elf64 convert solution

 

-Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>

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

 Portions copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>

 

 This program and the accompanying materials are licensed and made available

@@ -172,6 +172,10 @@ InitializeElf64 (
   //

   VerboseMsg ("Create COFF Section Offset Buffer");

   mCoffSectionsOffset = (UINT32 *)malloc(mEhdr->e_shnum * sizeof (UINT32));

+  if (mCoffSectionsOffset == NULL) {

+    Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");

+    return FALSE;

+  }

   memset(mCoffSectionsOffset, 0, mEhdr->e_shnum * sizeof(UINT32));

 

   //

@@ -518,6 +522,10 @@ ScanSections64 (
   // Allocate base Coff file.  Will be expanded later for relocations.

   //

   mCoffFile = (UINT8 *)malloc(mCoffOffset);

+  if (mCoffFile == NULL) {

+    Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");

+  }

+  assert (mCoffFile != NULL);

   memset(mCoffFile, 0, mCoffOffset);

 

   //

diff --git a/BaseTools/Source/C/GenFw/ElfConvert.c b/BaseTools/Source/C/GenFw/ElfConvert.c
index 6211389ba1..17913ff2df 100644
--- a/BaseTools/Source/C/GenFw/ElfConvert.c
+++ b/BaseTools/Source/C/GenFw/ElfConvert.c
@@ -1,7 +1,7 @@
 /** @file

 Elf convert solution

 

-Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2010 - 2016, 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 

@@ -24,6 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <string.h>

 #include <time.h>

 #include <ctype.h>

+#include <assert.h>

 

 #include <Common/UefiBaseTypes.h>

 #include <IndustryStandard/PeImage.h>

@@ -98,6 +99,10 @@ CoffAddFixup(
       mCoffFile,

       mCoffOffset + sizeof(EFI_IMAGE_BASE_RELOCATION) + 2 * MAX_COFF_ALIGNMENT

       );

+    if (mCoffFile == NULL) {

+      Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");

+    }

+    assert (mCoffFile != NULL);

     memset (

       mCoffFile + mCoffOffset, 0,

       sizeof(EFI_IMAGE_BASE_RELOCATION) + 2 * MAX_COFF_ALIGNMENT

diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/GenFw.c
index b62756a492..9ffc4c5b01 100644
--- a/BaseTools/Source/C/GenFw/GenFw.c
+++ b/BaseTools/Source/C/GenFw/GenFw.c
@@ -625,6 +625,10 @@ PeCoffConvertImageToXip (
   // Allocate the extra space that we need to grow the image

   //

   XipFile = malloc (XipLength);

+  if (XipFile == NULL) {

+    Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");

+    return;

+  }

   memset (XipFile, 0, XipLength);

 

   //

@@ -701,6 +705,10 @@ Returns:
                           + 3 * (sizeof (UINT16) + 3 * sizeof (CHAR16)) 

                           + sizeof (EFI_IMAGE_RESOURCE_DATA_ENTRY);

   HiiSectionHeader = malloc (HiiSectionHeaderSize);

+  if (HiiSectionHeader == NULL) {

+    Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");

+    return NULL;

+  }

   memset (HiiSectionHeader, 0, HiiSectionHeaderSize);

 

   HiiSectionOffset = 0;

@@ -1693,6 +1701,10 @@ Returns:
       // Create the resource section header

       //

       HiiSectionHeader = CreateHiiResouceSectionHeader (&HiiSectionHeaderSize, HiiPackageListHeader.PackageLength);

+      if (HiiSectionHeader == NULL) {

+        free (HiiPackageListBuffer);

+        goto Finish;

+      }

       //

       // Wrtie section header and HiiData into File.

       //

@@ -3028,8 +3040,10 @@ Returns:
   }

 

   ptime = localtime (&newtime);

-  DebugMsg (NULL, 0, 9, "New Image Time Stamp", "%04d-%02d-%02d %02d:%02d:%02d",

-            ptime->tm_year + 1900, ptime->tm_mon + 1, ptime->tm_mday, ptime->tm_hour, ptime->tm_min, ptime->tm_sec);

+  if (ptime != NULL) {

+    DebugMsg (NULL, 0, 9, "New Image Time Stamp", "%04d-%02d-%02d %02d:%02d:%02d",

+              ptime->tm_year + 1900, ptime->tm_mon + 1, ptime->tm_mday, ptime->tm_hour, ptime->tm_min, ptime->tm_sec);

+  }

   //

   // Set new time and data into PeImage.

   //