diff options
| author | Chao Zhang <chao.b.zhang@intel.com> | 2014-10-31 10:59:25 +0000 |
|---|---|---|
| committer | czhang46 <czhang46@Edk2> | 2014-10-31 10:59:25 +0000 |
| commit | f7fe68db7dad70646523a6ae2442f592651df8d9 (patch) | |
| tree | e957797547f791c991e7935305e09c354baa4b80 /SecurityPkg/Tcg/TrEEDxe | |
| parent | 6ebffb67c8eca68cf5eb36bd308b305ab84fdd99 (diff) | |
| download | edk2-f7fe68db7dad70646523a6ae2442f592651df8d9.tar.gz edk2-f7fe68db7dad70646523a6ae2442f592651df8d9.tar.bz2 edk2-f7fe68db7dad70646523a6ae2442f592651df8d9.zip | |
Remove redundant ASSERT in TcgDxe & TreeDxe. Some asserts are removed directly, some are replaced by debug output.
ASSERT for SetupEventLog is kept. It is the foundation of TcgProtocol and TrEEProtocol
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16281 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'SecurityPkg/Tcg/TrEEDxe')
| -rw-r--r-- | SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c index 09f8a364ad..8db0fa0df0 100644 --- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c +++ b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c @@ -1109,9 +1109,7 @@ MeasureHandoffTables ( (VOID **) &SmbiosTable
);
- if (!EFI_ERROR (Status)) {
- ASSERT (SmbiosTable != NULL);
-
+ if (!EFI_ERROR (Status) && SmbiosTable != NULL) {
TcgEvent.PCRIndex = 1;
TcgEvent.EventType = EV_EFI_HANDOFF_TABLES;
TcgEvent.EventSize = sizeof (HandoffTables);
@@ -1225,8 +1223,6 @@ MeasureVariable ( UINTN VarNameLength;
EFI_VARIABLE_DATA_TREE *VarLog;
- ASSERT ((VarSize == 0 && VarData == NULL) || (VarSize != 0 && VarData != NULL));
-
DEBUG ((EFI_D_ERROR, "TrEEDxe: MeasureVariable (Pcr - %x, EventType - %x, ", (UINTN)PCRIndex, (UINTN)EventType));
DEBUG ((EFI_D_ERROR, "VariableName - %s, VendorGuid - %g)\n", VarName, VendorGuid));
@@ -1318,10 +1314,12 @@ ReadAndMeasureVariable ( *VarSize = 0;
}
} else {
+ //
+ // if status error, VarData is freed and set NULL by GetVariable2
+ //
if (EFI_ERROR (Status)) {
- return Status;
+ return EFI_NOT_FOUND;
}
- ASSERT (*VarData != NULL);
}
Status = MeasureVariable (
@@ -1428,9 +1426,11 @@ MeasureAllBootVariables ( if (Status == EFI_NOT_FOUND) {
return EFI_SUCCESS;
}
- ASSERT (BootOrder != NULL);
if (EFI_ERROR (Status)) {
+ //
+ // BootOrder can't be NULL if status is not EFI_NOT_FOUND
+ //
FreePool (BootOrder);
return Status;
}
@@ -1721,7 +1721,10 @@ InstallAcpiTable ( &TableKey
);
}
- ASSERT_EFI_ERROR (Status);
+
+ if (EFI_ERROR (Status)) {
+ DEBUG((EFI_D_ERROR, "Tcg Acpi Table installation failure"));
+ }
}
/**
@@ -1748,7 +1751,9 @@ OnExitBootServices ( Status = TcgMeasureAction (
EFI_EXIT_BOOT_SERVICES_INVOCATION
);
- ASSERT_EFI_ERROR (Status);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_INVOCATION));
+ }
//
// Measure success of ExitBootServices
@@ -1756,7 +1761,9 @@ OnExitBootServices ( Status = TcgMeasureAction (
EFI_EXIT_BOOT_SERVICES_SUCCEEDED
);
- ASSERT_EFI_ERROR (Status);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_SUCCEEDED));
+ }
}
/**
@@ -1783,7 +1790,9 @@ OnExitBootServicesFailed ( Status = TcgMeasureAction (
EFI_EXIT_BOOT_SERVICES_FAILED
);
- ASSERT_EFI_ERROR (Status);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_FAILED));
+ }
}
|