SecurityPkg: Fix bug in TPM 1.2 SelfTest

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

diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
index c4714d3e193348d7e7562a525bfb554b422e9f0b..950802213232c80cf6df5457754b40f4e62e898d 100644 (file)
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2NVStorage.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implement TPM2 NVStorage related command.\r
 \r
-Copyright (c) 2013, Intel Corporation. All rights reserved. <BR>\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
@@ -250,11 +250,11 @@ Tpm2NvReadPublic (
   NvPublic->nvPublic.nameAlg = SwapBytes16 (NvPublic->nvPublic.nameAlg);\r
   WriteUnaligned32 ((UINT32 *)&NvPublic->nvPublic.attributes, SwapBytes32 (ReadUnaligned32 ((UINT32 *)&NvPublic->nvPublic.attributes)));\r
   NvPublic->nvPublic.authPolicy.size = SwapBytes16 (NvPublic->nvPublic.authPolicy.size);\r
-  Buffer = (UINT8 *)&NvPublic->nvPublic.authPolicy;\r
+  Buffer = (UINT8 *)&RecvBuffer.NvPublic.nvPublic.authPolicy;\r
   Buffer += sizeof(UINT16) + NvPublic->nvPublic.authPolicy.size;\r
   NvPublic->nvPublic.dataSize = SwapBytes16 (ReadUnaligned16 ((UINT16 *)Buffer));\r
 \r
-  CopyMem (NvName, (UINT8 *)&RecvBuffer + sizeof(TPM2_RESPONSE_HEADER) + sizeof(UINT16) + NvPublicSize, NvNameSize);\r
+  CopyMem (NvName->name, (UINT8 *)&RecvBuffer + sizeof(TPM2_RESPONSE_HEADER) + sizeof(UINT16) + NvPublicSize + sizeof(UINT16), NvNameSize);\r
   NvName->size = NvNameSize;\r
   \r
   return EFI_SUCCESS;\r
@@ -347,12 +347,13 @@ Tpm2NvDefineSpace (
   RecvBufferSize = sizeof (RecvBuffer);\r
   Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
   if (EFI_ERROR (Status)) {\r
-    return Status;\r
+    goto Done;\r
   }\r
 \r
   if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
     DEBUG ((EFI_D_ERROR, "Tpm2NvDefineSpace - RecvBufferSize Error - %x\n", RecvBufferSize));\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
   }\r
 \r
   ResponseCode = SwapBytes32(RecvBuffer.Header.responseCode);\r
@@ -365,24 +366,37 @@ Tpm2NvDefineSpace (
     break;\r
   case TPM_RC_SIZE + RC_NV_DefineSpace_publicInfo:\r
   case TPM_RC_SIZE + RC_NV_DefineSpace_auth:\r
-    return EFI_BAD_BUFFER_SIZE;\r
+    Status = EFI_BAD_BUFFER_SIZE;\r
+    break;\r
   case TPM_RC_ATTRIBUTES:\r
   case TPM_RC_ATTRIBUTES + RC_NV_DefineSpace_publicInfo:\r
-    return EFI_UNSUPPORTED;\r
+    Status = EFI_UNSUPPORTED;\r
+    break;\r
   case TPM_RC_ATTRIBUTES + RC_NV_DefineSpace_authHandle:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_NV_DEFINED:\r
-    return EFI_ALREADY_STARTED;\r
+    Status = EFI_ALREADY_STARTED;\r
+    break;\r
   case TPM_RC_VALUE + RC_NV_DefineSpace_publicInfo:\r
   case TPM_RC_VALUE + RC_NV_DefineSpace_authHandle:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_NV_SPACE:\r
-    return EFI_OUT_OF_RESOURCES;\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    break;\r
   default:\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    break;\r
   }\r
-  \r
-  return EFI_SUCCESS;\r
+\r
+Done:\r
+  //\r
+  // Clear AuthSession Content\r
+  //\r
+  ZeroMem (&SendBuffer, sizeof(SendBuffer));\r
+  ZeroMem (&RecvBuffer, sizeof(RecvBuffer));\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -441,12 +455,13 @@ Tpm2NvUndefineSpace (
   RecvBufferSize = sizeof (RecvBuffer);\r
   Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
   if (EFI_ERROR (Status)) {\r
-    return Status;\r
+    goto Done;\r
   }\r
 \r
   if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
     DEBUG ((EFI_D_ERROR, "Tpm2NvUndefineSpace - RecvBufferSize Error - %x\n", RecvBufferSize));\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
   }\r
 \r
   ResponseCode = SwapBytes32(RecvBuffer.Header.responseCode);\r
@@ -459,21 +474,33 @@ Tpm2NvUndefineSpace (
     break;\r
   case TPM_RC_ATTRIBUTES:\r
   case TPM_RC_ATTRIBUTES + RC_NV_UndefineSpace_nvIndex:\r
-    return EFI_UNSUPPORTED;\r
+    Status = EFI_UNSUPPORTED;\r
+    break;\r
   case TPM_RC_NV_AUTHORIZATION:\r
-    return EFI_SECURITY_VIOLATION;\r
+    Status = EFI_SECURITY_VIOLATION;\r
+    break;\r
   case TPM_RC_HANDLE + RC_NV_UndefineSpace_nvIndex: // TPM_RC_NV_DEFINED:\r
-    return EFI_NOT_FOUND;\r
+    Status = EFI_NOT_FOUND;\r
+    break;\r
   case TPM_RC_HANDLE + RC_NV_UndefineSpace_authHandle: // TPM_RC_NV_DEFINED:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_VALUE + RC_NV_UndefineSpace_authHandle:\r
   case TPM_RC_VALUE + RC_NV_UndefineSpace_nvIndex:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   default:\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    break;\r
   }\r
 \r
-  return EFI_SUCCESS;\r
+Done:\r
+  //\r
+  // Clear AuthSession Content\r
+  //\r
+  ZeroMem (&SendBuffer, sizeof(SendBuffer));\r
+  ZeroMem (&RecvBuffer, sizeof(RecvBuffer));\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -543,12 +570,13 @@ Tpm2NvRead (
   RecvBufferSize = sizeof (RecvBuffer);\r
   Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
   if (EFI_ERROR (Status)) {\r
-    return Status;\r
+    goto Done;\r
   }\r
 \r
   if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
     DEBUG ((EFI_D_ERROR, "Tpm2NvRead - RecvBufferSize Error - %x\n", RecvBufferSize));\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
   }\r
   ResponseCode = SwapBytes32(RecvBuffer.Header.responseCode);\r
   if (ResponseCode != TPM_RC_SUCCESS) {\r
@@ -559,30 +587,45 @@ Tpm2NvRead (
     // return data\r
     break;\r
   case TPM_RC_NV_AUTHORIZATION:\r
-    return EFI_SECURITY_VIOLATION;\r
+    Status = EFI_SECURITY_VIOLATION;\r
+    break;\r
   case TPM_RC_NV_LOCKED:\r
-    return EFI_ACCESS_DENIED;\r
+    Status = EFI_ACCESS_DENIED;\r
+    break;\r
   case TPM_RC_NV_RANGE:\r
-    return EFI_BAD_BUFFER_SIZE;\r
+    Status = EFI_BAD_BUFFER_SIZE;\r
+    break;\r
   case TPM_RC_NV_UNINITIALIZED:\r
-    return EFI_NOT_READY;\r
+    Status = EFI_NOT_READY;\r
+    break;\r
   case TPM_RC_HANDLE + RC_NV_Read_nvIndex: // TPM_RC_NV_DEFINED:\r
-    return EFI_NOT_FOUND;\r
+    Status = EFI_NOT_FOUND;\r
+    break;\r
   case TPM_RC_HANDLE + RC_NV_Read_authHandle: // TPM_RC_NV_DEFINED:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_VALUE + RC_NV_Read_nvIndex:\r
   case TPM_RC_VALUE + RC_NV_Read_authHandle:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_BAD_AUTH + RC_NV_Read_authHandle + TPM_RC_S:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_AUTH_UNAVAILABLE:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_AUTH_FAIL + RC_NV_Read_authHandle + TPM_RC_S:\r
-    return EFI_INVALID_PARAMETER;\r
-  default:\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_ATTRIBUTES + RC_NV_Read_authHandle + TPM_RC_S:\r
-    return EFI_UNSUPPORTED;\r
+    Status = EFI_UNSUPPORTED;\r
+    break;\r
+  default:\r
+    Status = EFI_DEVICE_ERROR;\r
+    break;\r
+  }\r
+  if (Status != EFI_SUCCESS) {\r
+    goto Done;\r
   }\r
 \r
   //\r
@@ -591,7 +634,13 @@ Tpm2NvRead (
   OutData->size = SwapBytes16 (RecvBuffer.Data.size);\r
   CopyMem (OutData->buffer, &RecvBuffer.Data.buffer, OutData->size);\r
   \r
-  return EFI_SUCCESS;\r
+Done:\r
+  //\r
+  // Clear AuthSession Content\r
+  //\r
+  ZeroMem (&SendBuffer, sizeof(SendBuffer));\r
+  ZeroMem (&RecvBuffer, sizeof(RecvBuffer));\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -661,12 +710,13 @@ Tpm2NvWrite (
   RecvBufferSize = sizeof (RecvBuffer);\r
   Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
   if (EFI_ERROR (Status)) {\r
-    return Status;\r
+    goto Done;\r
   }\r
 \r
   if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
     DEBUG ((EFI_D_ERROR, "Tpm2NvWrite - RecvBufferSize Error - %x\n", RecvBufferSize));\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
   }\r
   ResponseCode = SwapBytes32(RecvBuffer.Header.responseCode);\r
   if (ResponseCode != TPM_RC_SUCCESS) {\r
@@ -674,33 +724,54 @@ Tpm2NvWrite (
   }\r
   switch (ResponseCode) {\r
   case TPM_RC_SUCCESS:\r
-    return EFI_SUCCESS;\r
+    // return data\r
+    break;\r
   case TPM_RC_ATTRIBUTES:\r
-    return EFI_UNSUPPORTED;\r
+    Status = EFI_UNSUPPORTED;\r
+    break;\r
   case TPM_RC_NV_AUTHORIZATION:\r
-    return EFI_SECURITY_VIOLATION;\r
+    Status = EFI_SECURITY_VIOLATION;\r
+    break;\r
   case TPM_RC_NV_LOCKED:\r
-    return EFI_ACCESS_DENIED;\r
+    Status = EFI_ACCESS_DENIED;\r
+    break;\r
   case TPM_RC_NV_RANGE:\r
-    return EFI_BAD_BUFFER_SIZE;\r
+    Status = EFI_BAD_BUFFER_SIZE;\r
+    break;\r
   case TPM_RC_HANDLE + RC_NV_Write_nvIndex: // TPM_RC_NV_DEFINED:\r
-    return EFI_NOT_FOUND;\r
+    Status = EFI_NOT_FOUND;\r
+    break;\r
   case TPM_RC_HANDLE + RC_NV_Write_authHandle: // TPM_RC_NV_DEFINED:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_VALUE + RC_NV_Write_nvIndex:\r
   case TPM_RC_VALUE + RC_NV_Write_authHandle:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_BAD_AUTH + RC_NV_Write_authHandle + TPM_RC_S:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_AUTH_UNAVAILABLE:\r
-    return EFI_INVALID_PARAMETER;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_AUTH_FAIL + RC_NV_Write_authHandle + TPM_RC_S:\r
-    return EFI_INVALID_PARAMETER;\r
-  default:\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_INVALID_PARAMETER;\r
+    break;\r
   case TPM_RC_ATTRIBUTES + RC_NV_Write_authHandle + TPM_RC_S:\r
-    return EFI_UNSUPPORTED;\r
+    Status = EFI_UNSUPPORTED;\r
+    break;\r
+  default:\r
+    Status = EFI_DEVICE_ERROR;\r
+    break;\r
   }\r
+\r
+Done:\r
+  //\r
+  // Clear AuthSession Content\r
+  //\r
+  ZeroMem (&SendBuffer, sizeof(SendBuffer));\r
+  ZeroMem (&RecvBuffer, sizeof(RecvBuffer));\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -759,12 +830,13 @@ Tpm2NvReadLock (
   RecvBufferSize = sizeof (RecvBuffer);\r
   Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
   if (EFI_ERROR (Status)) {\r
-    return Status;\r
+    goto Done;\r
   }\r
 \r
   if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
     DEBUG ((EFI_D_ERROR, "Tpm2NvReadLock - RecvBufferSize Error - %x\n", RecvBufferSize));\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
   }\r
 \r
   ResponseCode = SwapBytes32(RecvBuffer.Header.responseCode);\r
@@ -776,10 +848,17 @@ Tpm2NvReadLock (
     // return data\r
     break;\r
   default:\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    break;\r
   }\r
 \r
-  return EFI_SUCCESS;\r
+Done:\r
+  //\r
+  // Clear AuthSession Content\r
+  //\r
+  ZeroMem (&SendBuffer, sizeof(SendBuffer));\r
+  ZeroMem (&RecvBuffer, sizeof(RecvBuffer));\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -838,12 +917,13 @@ Tpm2NvWriteLock (
   RecvBufferSize = sizeof (RecvBuffer);\r
   Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
   if (EFI_ERROR (Status)) {\r
-    return Status;\r
+    goto Done;\r
   }\r
 \r
   if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
     DEBUG ((EFI_D_ERROR, "Tpm2NvWriteLock - RecvBufferSize Error - %x\n", RecvBufferSize));\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
   }\r
 \r
   ResponseCode = SwapBytes32(RecvBuffer.Header.responseCode);\r
@@ -855,10 +935,17 @@ Tpm2NvWriteLock (
     // return data\r
     break;\r
   default:\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    break;\r
   }\r
 \r
-  return EFI_SUCCESS;\r
+Done:\r
+  //\r
+  // Clear AuthSession Content\r
+  //\r
+  ZeroMem (&SendBuffer, sizeof(SendBuffer));\r
+  ZeroMem (&RecvBuffer, sizeof(RecvBuffer));\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -914,12 +1001,13 @@ Tpm2NvGlobalWriteLock (
   RecvBufferSize = sizeof (RecvBuffer);\r
   Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
   if (EFI_ERROR (Status)) {\r
-    return Status;\r
+    goto Done;\r
   }\r
 \r
   if (RecvBufferSize < sizeof (TPM2_RESPONSE_HEADER)) {\r
     DEBUG ((EFI_D_ERROR, "Tpm2NvGlobalWriteLock - RecvBufferSize Error - %x\n", RecvBufferSize));\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
   }\r
 \r
   ResponseCode = SwapBytes32(RecvBuffer.Header.responseCode);\r
@@ -931,8 +1019,15 @@ Tpm2NvGlobalWriteLock (
     // return data\r
     break;\r
   default:\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    break;\r
   }\r
 \r
-  return EFI_SUCCESS;\r
+Done:\r
+  //\r
+  // Clear AuthSession Content\r
+  //\r
+  ZeroMem (&SendBuffer, sizeof(SendBuffer));\r
+  ZeroMem (&RecvBuffer, sizeof(RecvBuffer));\r
+  return Status;\r
 }\r