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/Library/DxeTpmMeasureBootLib | |
| parent | 4610b23ab10942d140eb51c4bdbefc5f896979ad (diff) | |
| download | edk2-6f785cfcc304c48ec04e542ee429df95e7b51bc5.tar.gz edk2-6f785cfcc304c48ec04e542ee429df95e7b51bc5.tar.bz2 edk2-6f785cfcc304c48ec04e542ee429df95e7b51bc5.zip | |
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/Library/DxeTpmMeasureBootLib')
| -rw-r--r-- | SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c index 5bfa282bc5..466a74ef09 100644 --- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c +++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c @@ -15,7 +15,7 @@ TcgMeasureGptTable() function will receive untrusted GPT partition table, and parse
partition data carefully.
-Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 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
@@ -768,7 +768,7 @@ DxeTpmMeasureBootHandler ( &EventLogLocation,
&EventLogLastEntry
);
- if (EFI_ERROR (Status) || ProtocolCapability.TPMDeactivatedFlag) {
+ if (EFI_ERROR (Status) || ProtocolCapability.TPMDeactivatedFlag || (!ProtocolCapability.TPMPresentFlag)) {
//
// TPM device doesn't work or activate.
//
|