SecurityPkg: Replace BSD License with BSD+Patent License

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

diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
index 950802213232c80cf6df5457754b40f4e62e898d..87572de20164cfa952e4d0c8d999531c8e35196e 100644 (file)
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
@@ -1,14 +1,8 @@
 /** @file\r
   Implement TPM2 NVStorage related command.\r
 \r
-Copyright (c) 2013 - 2016, 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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved. <BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -162,7 +156,7 @@ typedef struct {
   @param[in]  NvIndex            The NV Index.\r
   @param[out] NvPublic           The public area of the index.\r
   @param[out] NvName             The Name of the nvIndex.\r
-  \r
+\r
   @retval EFI_SUCCESS            Operation completed successfully.\r
   @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
   @retval EFI_NOT_FOUND          The command was returned successfully, but NvIndex is not found.\r
@@ -192,7 +186,7 @@ Tpm2NvReadPublic (
   SendBuffer.Header.commandCode = SwapBytes32(TPM_CC_NV_ReadPublic);\r
 \r
   SendBuffer.NvIndex = SwapBytes32 (NvIndex);\r
- \r
+\r
   SendBufferSize = (UINT32) sizeof (SendBuffer);\r
   SendBuffer.Header.paramSize = SwapBytes32 (SendBufferSize);\r
 \r
@@ -234,10 +228,19 @@ Tpm2NvReadPublic (
   // Basic check\r
   //\r
   NvPublicSize = SwapBytes16 (RecvBuffer.NvPublic.size);\r
+  if (NvPublicSize > sizeof(TPMS_NV_PUBLIC)) {\r
+    DEBUG ((DEBUG_ERROR, "Tpm2NvReadPublic - NvPublic.size error %x\n", NvPublicSize));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
   NvNameSize = SwapBytes16 (ReadUnaligned16 ((UINT16 *)((UINT8 *)&RecvBuffer + sizeof(TPM2_RESPONSE_HEADER) + sizeof(UINT16) + NvPublicSize)));\r
+  if (NvNameSize > sizeof(TPMU_NAME)){\r
+    DEBUG ((DEBUG_ERROR, "Tpm2NvReadPublic - NvNameSize error %x\n", NvNameSize));\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
 \r
   if (RecvBufferSize != sizeof(TPM2_RESPONSE_HEADER) + sizeof(UINT16) + NvPublicSize + sizeof(UINT16) + NvNameSize) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2NvReadPublic - RecvBufferSize Error - NvPublicSize %x, NvNameSize %x\n", RecvBufferSize, NvNameSize));\r
+    DEBUG ((EFI_D_ERROR, "Tpm2NvReadPublic - RecvBufferSize Error - NvPublicSize %x\n", RecvBufferSize));\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -256,7 +259,7 @@ Tpm2NvReadPublic (
 \r
   CopyMem (NvName->name, (UINT8 *)&RecvBuffer + sizeof(TPM2_RESPONSE_HEADER) + sizeof(UINT16) + NvPublicSize + sizeof(UINT16), NvNameSize);\r
   NvName->size = NvNameSize;\r
-  \r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -269,7 +272,7 @@ Tpm2NvReadPublic (
   @param[in]  AuthSession        Auth Session context\r
   @param[in]  Auth               The authorization data.\r
   @param[in]  NvPublic           The public area of the index.\r
-  \r
+\r
   @retval EFI_SUCCESS            Operation completed successfully.\r
   @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
   @retval EFI_ALREADY_STARTED    The command was returned successfully, but NvIndex is already defined.\r
@@ -405,7 +408,7 @@ Done:
   @param[in]  AuthHandle         TPM_RH_OWNER or TPM_RH_PLATFORM+{PP}.\r
   @param[in]  NvIndex            The NV Index.\r
   @param[in]  AuthSession        Auth Session context\r
-  \r
+\r
   @retval EFI_SUCCESS            Operation completed successfully.\r
   @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
   @retval EFI_NOT_FOUND          The command was returned successfully, but NvIndex is not found.\r
@@ -512,7 +515,7 @@ Done:
   @param[in]     Size               Number of bytes to read.\r
   @param[in]     Offset             Byte offset into the area.\r
   @param[in,out] OutData            The data read.\r
-  \r
+\r
   @retval EFI_SUCCESS            Operation completed successfully.\r
   @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
   @retval EFI_NOT_FOUND          The command was returned successfully, but NvIndex is not found.\r
@@ -632,8 +635,14 @@ Tpm2NvRead (
   // Return the response\r
   //\r
   OutData->size = SwapBytes16 (RecvBuffer.Data.size);\r
+  if (OutData->size > MAX_DIGEST_BUFFER) {\r
+    DEBUG ((DEBUG_ERROR, "Tpm2NvRead - OutData->size error %x\n", OutData->size));\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
+  }\r
+\r
   CopyMem (OutData->buffer, &RecvBuffer.Data.buffer, OutData->size);\r
-  \r
+\r
 Done:\r
   //\r
   // Clear AuthSession Content\r
@@ -651,7 +660,7 @@ Done:
   @param[in]  AuthSession        Auth Session context\r
   @param[in]  InData             The data to write.\r
   @param[in]  Offset             The offset into the NV Area.\r
-  \r
+\r
   @retval EFI_SUCCESS            Operation completed successfully.\r
   @retval EFI_DEVICE_ERROR       The command was unsuccessful.\r
   @retval EFI_NOT_FOUND          The command was returned successfully, but NvIndex is not found.\r