SecurityPkg Tpm2CommandLib: Fix TPM2.0 response memory overflow

[mirror_edk2.git] / SecurityPkg / Library / Tpm2CommandLib / Tpm2Object.c

diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Object.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Object.c
index e070ff2f74a4f13a46648983a5c152af0becb737..89f30a2c6e6a24a2430ba62ab82251ad5e05f273 100644 (file)
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Object.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Object.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implement TPM2 Object related command.\r
 \r
-Copyright (c) 2017, Intel Corporation. All rights reserved. <BR>\r
+Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved. <BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -109,11 +109,25 @@ Tpm2ReadPublic (
   // Basic check\r
   //\r
   OutPublicSize = SwapBytes16 (RecvBuffer.OutPublic.size);\r
+  if (OutPublicSize > sizeof(TPMT_PUBLIC)) {\r
+    DEBUG ((DEBUG_ERROR, "Tpm2ReadPublic - OutPublicSize error %x\n", OutPublicSize));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
   NameSize = SwapBytes16 (ReadUnaligned16 ((UINT16 *)((UINT8 *)&RecvBuffer + sizeof(TPM2_RESPONSE_HEADER) +\r
                           sizeof(UINT16) + OutPublicSize)));\r
+  if (NameSize > sizeof(TPMU_NAME)) {\r
+    DEBUG ((DEBUG_ERROR, "Tpm2ReadPublic - NameSize error %x\n", NameSize));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
   QualifiedNameSize = SwapBytes16 (ReadUnaligned16 ((UINT16 *)((UINT8 *)&RecvBuffer + sizeof(TPM2_RESPONSE_HEADER) +\r
                                    sizeof(UINT16) + OutPublicSize +\r
                                    sizeof(UINT16) + NameSize)));\r
+  if (QualifiedNameSize > sizeof(TPMU_NAME)) {\r
+    DEBUG ((DEBUG_ERROR, "Tpm2ReadPublic - QualifiedNameSize error %x\n", QualifiedNameSize));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
 \r
   if (RecvBufferSize != sizeof(TPM2_RESPONSE_HEADER) + sizeof(UINT16) + OutPublicSize + sizeof(UINT16) + NameSize + sizeof(UINT16) + QualifiedNameSize) {\r
     DEBUG ((DEBUG_ERROR, "Tpm2ReadPublic - RecvBufferSize %x Error - OutPublicSize %x, NameSize %x, QualifiedNameSize %x\n", RecvBufferSize, OutPublicSize, NameSize, QualifiedNameSize));\r
@@ -132,6 +146,11 @@ Tpm2ReadPublic (
   Buffer = (UINT8 *)&RecvBuffer.OutPublic.publicArea.authPolicy;\r
   OutPublic->publicArea.authPolicy.size = SwapBytes16 (ReadUnaligned16 ((UINT16 *)Buffer));\r
   Buffer += sizeof(UINT16);\r
+  if (OutPublic->publicArea.authPolicy.size > sizeof(TPMU_HA)) {\r
+    DEBUG ((DEBUG_ERROR, "Tpm2ReadPublic - authPolicy.size error %x\n", OutPublic->publicArea.authPolicy.size));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
   CopyMem (OutPublic->publicArea.authPolicy.buffer, Buffer, OutPublic->publicArea.authPolicy.size);\r
   Buffer += OutPublic->publicArea.authPolicy.size;\r
 \r
@@ -307,28 +326,48 @@ Tpm2ReadPublic (
   case TPM_ALG_KEYEDHASH:\r
     OutPublic->publicArea.unique.keyedHash.size = SwapBytes16 (ReadUnaligned16 ((UINT16 *)Buffer));\r
     Buffer += sizeof(UINT16);\r
+    if(OutPublic->publicArea.unique.keyedHash.size > sizeof(TPMU_HA)) {\r
+      DEBUG ((DEBUG_ERROR, "Tpm2ReadPublic - keyedHash.size error %x\n", OutPublic->publicArea.unique.keyedHash.size));\r
+      return EFI_DEVICE_ERROR;\r
+    }\r
     CopyMem (OutPublic->publicArea.unique.keyedHash.buffer, Buffer, OutPublic->publicArea.unique.keyedHash.size);\r
     Buffer += OutPublic->publicArea.unique.keyedHash.size;\r
     break;\r
   case TPM_ALG_SYMCIPHER:\r
     OutPublic->publicArea.unique.sym.size = SwapBytes16 (ReadUnaligned16 ((UINT16 *)Buffer));\r
     Buffer += sizeof(UINT16);\r
+    if(OutPublic->publicArea.unique.sym.size > sizeof(TPMU_HA)) {\r
+      DEBUG ((DEBUG_ERROR, "Tpm2ReadPublic - sym.size error %x\n", OutPublic->publicArea.unique.sym.size));\r
+      return EFI_DEVICE_ERROR;\r
+    }\r
     CopyMem (OutPublic->publicArea.unique.sym.buffer, Buffer, OutPublic->publicArea.unique.sym.size);\r
     Buffer += OutPublic->publicArea.unique.sym.size;\r
     break;\r
   case TPM_ALG_RSA:\r
     OutPublic->publicArea.unique.rsa.size = SwapBytes16 (ReadUnaligned16 ((UINT16 *)Buffer));\r
     Buffer += sizeof(UINT16);\r
+    if(OutPublic->publicArea.unique.rsa.size > MAX_RSA_KEY_BYTES) {\r
+      DEBUG ((DEBUG_ERROR, "Tpm2ReadPublic - rsa.size error %x\n", OutPublic->publicArea.unique.rsa.size));\r
+      return EFI_DEVICE_ERROR;\r
+    }\r
     CopyMem (OutPublic->publicArea.unique.rsa.buffer, Buffer, OutPublic->publicArea.unique.rsa.size);\r
     Buffer += OutPublic->publicArea.unique.rsa.size;\r
     break;\r
   case TPM_ALG_ECC:\r
     OutPublic->publicArea.unique.ecc.x.size = SwapBytes16 (ReadUnaligned16 ((UINT16 *)Buffer));\r
     Buffer += sizeof(UINT16);\r
+    if (OutPublic->publicArea.unique.ecc.x.size > MAX_ECC_KEY_BYTES) {\r
+      DEBUG ((DEBUG_ERROR, "Tpm2ReadPublic - ecc.x.size error %x\n", OutPublic->publicArea.unique.ecc.x.size));\r
+      return EFI_DEVICE_ERROR;\r
+    }\r
     CopyMem (OutPublic->publicArea.unique.ecc.x.buffer, Buffer, OutPublic->publicArea.unique.ecc.x.size);\r
     Buffer += OutPublic->publicArea.unique.ecc.x.size;\r
     OutPublic->publicArea.unique.ecc.y.size = SwapBytes16 (ReadUnaligned16 ((UINT16 *)Buffer));\r
     Buffer += sizeof(UINT16);\r
+    if (OutPublic->publicArea.unique.ecc.y.size > MAX_ECC_KEY_BYTES) {\r
+      DEBUG ((DEBUG_ERROR, "Tpm2ReadPublic - ecc.y.size error %x\n", OutPublic->publicArea.unique.ecc.y.size));\r
+      return EFI_DEVICE_ERROR;\r
+    }\r
     CopyMem (OutPublic->publicArea.unique.ecc.y.buffer, Buffer, OutPublic->publicArea.unique.ecc.y.size);\r
     Buffer += OutPublic->publicArea.unique.ecc.y.size;\r
     break;\r