diff options
| author | Yao, Jiewen <jiewen.yao@intel.com> | 2015-01-12 03:21:00 +0000 |
|---|---|---|
| committer | jyao1 <jyao1@Edk2> | 2015-01-12 03:21:00 +0000 |
| commit | 6f785cfcc304c48ec04e542ee429df95e7b51bc5 (patch) | |
| tree | 5fc40fc8b8be583bf58179a4e3d245cad6c5e1ad /SecurityPkg/Tcg/TcgPei/TpmComm.c | |
| parent | 4610b23ab10942d140eb51c4bdbefc5f896979ad (diff) | |
| download | edk2-platforms-6f785cfcc304c48ec04e542ee429df95e7b51bc5.tar.xz | |
Handle TPM device error and avoid deadloop in BDS.
If TPM error happens, set TPM flag to NOT present, so that trusted boot patch is disabled.
Also report status code for failure, so that platform may register handler to apply policy like force system reset, or disable TPM permanently.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <jiewen.yao@intel.com>
Reviewed-by: "Dong, Guo" <guo.dong@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16598 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'SecurityPkg/Tcg/TcgPei/TpmComm.c')
| -rw-r--r-- | SecurityPkg/Tcg/TcgPei/TpmComm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/SecurityPkg/Tcg/TcgPei/TpmComm.c b/SecurityPkg/Tcg/TcgPei/TpmComm.c index fb5011ee9d..899c8e3e0b 100644 --- a/SecurityPkg/Tcg/TcgPei/TpmComm.c +++ b/SecurityPkg/Tcg/TcgPei/TpmComm.c @@ -1,7 +1,7 @@ /** @file
Utility functions used by TPM PEI driver.
-Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2015, 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
@@ -222,7 +222,9 @@ TpmCommExtend ( SendBuffer.PcrIndex = SwapBytes32 (PcrIndex);
CopyMem (&SendBuffer.TpmDigest, (UINT8 *)DigestToExtend, sizeof (TPM_DIGEST));
Status = TisTpmCommand (PeiServices, TpmHandle, (UINT8 *)&SendBuffer, TpmSendSize, RecvBuffer, &TpmRecvSize);
- ASSERT_EFI_ERROR (Status);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
if(NewPcrValue != NULL) {
CopyMem ((UINT8*)NewPcrValue, &RecvBuffer[10], sizeof (TPM_DIGEST));
|