diff options
| author | Yao, Jiewen <jiewen.yao@intel.com> | 2015-01-13 01:18:11 +0000 |
|---|---|---|
| committer | jyao1 <jyao1@Edk2> | 2015-01-13 01:18:11 +0000 |
| commit | 5dbb66351a4008305d148710bd576aeb42c61327 (patch) | |
| tree | c9ec8fbb7475e78308f02096c93ad4b23843dc93 /SecurityPkg/Tcg | |
| parent | ae591c14b333757a33768e80481bc301b8855686 (diff) | |
| download | edk2-5dbb66351a4008305d148710bd576aeb42c61327.zip edk2-5dbb66351a4008305d148710bd576aeb42c61327.tar.gz edk2-5dbb66351a4008305d148710bd576aeb42c61327.tar.bz2 | |
Check in missing patch for TPM error handling.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <jiewen.yao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16602 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'SecurityPkg/Tcg')
| -rw-r--r-- | SecurityPkg/Tcg/TcgDxe/TcgDxe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c index ea05dc8..db7951c 100644 --- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c +++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c @@ -265,7 +265,7 @@ TcgDxeStatusCheck ( }
if (EventLogLastEntry != NULL) {
- if (TcgData->BsCap.TPMDeactivatedFlag || (!ProtocolCapability.TPMPresentFlag)) {
+ if (TcgData->BsCap.TPMDeactivatedFlag || (!TcgData->BsCap.TPMPresentFlag)) {
*EventLogLastEntry = (EFI_PHYSICAL_ADDRESS)(UINTN)0;
} else {
*EventLogLastEntry = (EFI_PHYSICAL_ADDRESS)(UINTN)TcgData->LastEvent;
@@ -412,7 +412,7 @@ TcgDxeLogEvent ( TcgData = TCG_DXE_DATA_FROM_THIS (This);
- if (TcgData->BsCap.TPMDeactivatedFlag || (!ProtocolCapability.TPMPresentFlag)) {
+ if (TcgData->BsCap.TPMDeactivatedFlag || (!TcgData->BsCap.TPMPresentFlag)) {
return EFI_DEVICE_ERROR;
}
return TcgDxeLogEventI (
@@ -581,7 +581,7 @@ TcgDxeHashLogExtendEvent ( TcgData = TCG_DXE_DATA_FROM_THIS (This);
- if (TcgData->BsCap.TPMDeactivatedFlag || (!ProtocolCapability.TPMPresentFlag)) {
+ if (TcgData->BsCap.TPMDeactivatedFlag || (!TcgData->BsCap.TPMPresentFlag)) {
return EFI_DEVICE_ERROR;
}
@@ -589,7 +589,7 @@ TcgDxeHashLogExtendEvent ( return EFI_UNSUPPORTED;
}
- if (HashData == NULL && HashDataLen > 0) {
+ if (HashData == 0 && HashDataLen > 0) {
return EFI_INVALID_PARAMETER;
}
@@ -1383,7 +1383,7 @@ DriverEntry ( EFI_NATIVE_INTERFACE,
&mTcgDxeData.TcgProtocol
);
- if (!EFI_ERROR (Status) && (!mTcgDxeData.BsCap.TPMDeactivatedFlag) && ProtocolCapability.TPMPresentFlag) {
+ if (!EFI_ERROR (Status) && (!mTcgDxeData.BsCap.TPMDeactivatedFlag) && mTcgDxeData.BsCap.TPMPresentFlag) {
//
// Setup the log area and copy event log from hob list to it
//
|