BaseTools: Add more checker in Decompress algorithm to access the valid buffer (CVE FIX)

Fix CVE-2017-5731,CVE-2017-5732,CVE-2017-5733,CVE-2017-5734,CVE-2017-5735
https://bugzilla.tianocore.org/show_bug.cgi?id=686

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Holtsclaw Brent <brent.holtsclaw@intel.com>
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
(cherry picked from commit 041d89bc0f0119df37a5fce1d0f16495ff905089)

2 files changed, 48 insertions, 4 deletions

diff --git a/BaseTools/Source/C/Common/Decompress.c b/BaseTools/Source/C/Common/Decompress.c
index 48578ea2f2..3e66330bb5 100644
--- a/BaseTools/Source/C/Common/Decompress.c
+++ b/BaseTools/Source/C/Common/Decompress.c
@@ -193,12 +193,16 @@ Returns:
   UINT16  Avail;

   UINT16  NextCode;

   UINT16  Mask;

+  UINT16  MaxTableLength;

 

   for (Index = 1; Index <= 16; Index++) {

     Count[Index] = 0;

   }

 

   for (Index = 0; Index < NumOfChar; Index++) {

+    if (BitLen[Index] > 16) {

+      return (UINT16) BAD_TABLE;

+    }

     Count[BitLen[Index]]++;

   }

 

@@ -236,6 +240,7 @@ Returns:
 

   Avail = NumOfChar;

   Mask  = (UINT16) (1U << (15 - TableBits));

+  MaxTableLength = (UINT16) (1U << TableBits);

 

   for (Char = 0; Char < NumOfChar; Char++) {

 

@@ -249,6 +254,9 @@ Returns:
     if (Len <= TableBits) {

 

       for (Index = Start[Len]; Index < NextCode; Index++) {

+        if (Index >= MaxTableLength) {

+          return (UINT16) BAD_TABLE;

+        }

         Table[Index] = Char;

       }

 

@@ -640,10 +648,14 @@ Returns: (VOID)
 

       BytesRemain--;

       while ((INT16) (BytesRemain) >= 0) {

-        Sd->mDstBase[Sd->mOutBuf++] = Sd->mDstBase[DataIdx++];

         if (Sd->mOutBuf >= Sd->mOrigSize) {

           return ;

         }

+        if (DataIdx >= Sd->mOrigSize) {

+          Sd->mBadTableFlag = (UINT16) BAD_TABLE;

+          return ;

+        }

+        Sd->mDstBase[Sd->mOutBuf++] = Sd->mDstBase[DataIdx++];

 

         BytesRemain--;

       }

@@ -681,6 +693,7 @@ Returns:
 --*/

 {

   UINT8 *Src;

+  UINT32 CompSize;

 

   *ScratchSize  = sizeof (SCRATCH_DATA);

 

@@ -689,7 +702,13 @@ Returns:
     return EFI_INVALID_PARAMETER;

   }

 

+  CompSize = Src[0] + (Src[1] << 8) + (Src[2] << 16) + (Src[3] << 24);

   *DstSize = Src[4] + (Src[5] << 8) + (Src[6] << 16) + (Src[7] << 24);

+

+  if (SrcSize < CompSize + 8 || (CompSize + 8) < 8) {

+    return EFI_INVALID_PARAMETER;

+  }

+

   return EFI_SUCCESS;

 }

 

@@ -749,7 +768,7 @@ Returns:
   CompSize  = Src[0] + (Src[1] << 8) + (Src[2] << 16) + (Src[3] << 24);

   OrigSize  = Src[4] + (Src[5] << 8) + (Src[6] << 16) + (Src[7] << 24);

 

-  if (SrcSize < CompSize + 8) {

+  if (SrcSize < CompSize + 8 || (CompSize + 8) < 8) {

     return EFI_INVALID_PARAMETER;

   }

 

diff --git a/BaseTools/Source/C/TianoCompress/TianoCompress.c b/BaseTools/Source/C/TianoCompress/TianoCompress.c
index 70f1b61a5c..9daa993549 100644
--- a/BaseTools/Source/C/TianoCompress/TianoCompress.c
+++ b/BaseTools/Source/C/TianoCompress/TianoCompress.c
@@ -1744,6 +1744,7 @@ Returns:
   SCRATCH_DATA      *Scratch;

   UINT8      *Src;

   UINT32     OrigSize;

+  UINT32     CompSize;

 

   SetUtilityName(UTILITY_NAME);

   

@@ -1752,6 +1753,7 @@ Returns:
   OutBuffer = NULL;

   Scratch   = NULL;

   OrigSize = 0;

+  CompSize = 0;

   InputLength = 0;

   InputFileName = NULL;

   OutputFileName = NULL;

@@ -1965,15 +1967,25 @@ Returns:
   if (DebugMode) {

     DebugMsg(UTILITY_NAME, 0, DebugLevel, "Decoding\n", NULL);

   }

+

+  if (InputLength < 8){

+    Error (NULL, 0, 3000, "Invalid", "The input file %s is too small.", InputFileName);

+    goto ERROR;

+  }

   //

   // Get Compressed file original size

   // 

   Src     = (UINT8 *)FileBuffer;                     

   OrigSize  = Src[4] + (Src[5] << 8) + (Src[6] << 16) + (Src[7] << 24);  

-  

+  CompSize  = Src[0] + (Src[1] << 8) + (Src[2] <<16) + (Src[3] <<24);

+

   //

   // Allocate OutputBuffer

   //

+  if (InputLength < CompSize + 8 || (CompSize + 8) < 8) {

+    Error (NULL, 0, 3000, "Invalid", "The input file %s data is invalid.", InputFileName);

+    goto ERROR;

+  }

   OutBuffer = (UINT8 *)malloc(OrigSize);

   if (OutBuffer == NULL) {

     Error (NULL, 0, 4001, "Resource:", "Memory cannot be allocated!");

@@ -2149,12 +2161,16 @@ Returns:
   UINT16  Mask;

   UINT16  WordOfStart;

   UINT16  WordOfCount;

+  UINT16  MaxTableLength;

 

   for (Index = 1; Index <= 16; Index++) {

     Count[Index] = 0;

   }

 

   for (Index = 0; Index < NumOfChar; Index++) {

+    if (BitLen[Index] > 16) {

+      return (UINT16) BAD_TABLE;

+    }

     Count[BitLen[Index]]++;

   }

 

@@ -2196,6 +2212,7 @@ Returns:
 

   Avail = NumOfChar;

   Mask  = (UINT16) (1U << (15 - TableBits));

+  MaxTableLength = (UINT16) (1U << TableBits);

 

   for (Char = 0; Char < NumOfChar; Char++) {

 

@@ -2209,6 +2226,9 @@ Returns:
     if (Len <= TableBits) {

 

       for (Index = Start[Len]; Index < NextCode; Index++) {

+        if (Index >= MaxTableLength) {

+          return (UINT16) BAD_TABLE;

+        }

         Table[Index] = Char;

       }

 

@@ -2591,11 +2611,16 @@ Returns: (VOID)
       DataIdx     = Sd->mOutBuf - DecodeP (Sd) - 1;

 

       BytesRemain--;

+

       while ((INT16) (BytesRemain) >= 0) {

-        Sd->mDstBase[Sd->mOutBuf++] = Sd->mDstBase[DataIdx++];

         if (Sd->mOutBuf >= Sd->mOrigSize) {

           goto Done ;

         }

+        if (DataIdx >= Sd->mOrigSize) {

+          Sd->mBadTableFlag = (UINT16) BAD_TABLE;

+          goto Done ;

+        }

+        Sd->mDstBase[Sd->mOutBuf++] = Sd->mDstBase[DataIdx++];

 

         BytesRemain--;

       }