CryptoPkg: Fix CryptAuthenticode fuzz

Signed-off-by: Wenxing Hou <wenxing.hou@intel.com>
tianocore · Mar 20, 2024 · 2df1b2c · 2df1b2c
1 parent f1afa77
commit 2df1b2c
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/Pk/CryptAuthenticode.c b/CryptoPkg/Library/BaseCryptLibMbedTls/Pk/CryptAuthenticode.c
@@ -72,6 +72,10 @@ AuthenticodeVerify (
     return FALSE;
   }
 
+  if (DataSize <= HashSize) {
+    return FALSE;
+  }
+
   Ptr = (UINT8 *)(UINTN)AuthData;
   Len = (UINT32)DataSize;
   End = Ptr + Len;
@@ -188,6 +192,10 @@ AuthenticodeVerify (
   // defined in Authenticode
   // NOTE: Need to double-check HashLength here!
   //
+  if (ContentSize < HashSize) {
+    return FALSE;
+  }
+
   if (CompareMem (SpcIndirectDataContent + ContentSize - HashSize, ImageHash, HashSize) != 0) {
     //
     // Un-matched PE/COFF Hash Value