1 files changed, 6 insertions, 1 deletions
diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c
index f03b6689ac..35ad86a17a 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c
@@ -1,7 +1,7 @@
 /** @file
   Implement TPM2 Session related command.
 
-Copyright (c) 2014, Intel Corporation. All rights reserved. <BR>
+Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved. <BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -163,6 +163,11 @@ Tpm2StartAuthSession (
   //
   *SessionHandle = SwapBytes32 (RecvBuffer.SessionHandle);
   NonceTPM->size = SwapBytes16 (RecvBuffer.NonceTPM.size);
+  if (NonceTPM->size > sizeof(TPMU_HA)) {
+    DEBUG ((DEBUG_ERROR, "Tpm2StartAuthSession - NonceTPM->size error %x\n", NonceTPM->size));
+    return EFI_DEVICE_ERROR;
+  }
+
   CopyMem (NonceTPM->buffer, &RecvBuffer.NonceTPM.buffer, NonceTPM->size);
 
   return EFI_SUCCESS;