1 files changed, 28 insertions, 23 deletions
diff --git a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c
index ebc7367fae..8a5e7d17c6 100644
--- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c
+++ b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c
@@ -8,7 +8,7 @@
 
   ExecutePendingTpmRequest() will receive untrusted input and do validation.
 
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2014, 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 
@@ -1059,6 +1059,9 @@ ExecutePendingTpmRequest (
                       sizeof (UINT8),
                       &NewFlags
                       ); 
+    if (EFI_ERROR (Status)) {
+      return;
+    }
   }
 
 
@@ -1162,19 +1165,20 @@ TcgPhysicalPresenceLibProcessRequest (
                   &PpiFlags
                   );
   if (EFI_ERROR (Status)) {
-    if (Status == EFI_NOT_FOUND) {
-      PpiFlags = FLAG_NO_PPI_PROVISION;
-      Status   = gRT->SetVariable (
-                        PHYSICAL_PRESENCE_FLAGS_VARIABLE,
-                        &gEfiPhysicalPresenceGuid,
-                        EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
-                        sizeof (UINT8),
-                        &PpiFlags
-                        );
+    PpiFlags = FLAG_NO_PPI_PROVISION;
+    Status   = gRT->SetVariable (
+                      PHYSICAL_PRESENCE_FLAGS_VARIABLE,
+                      &gEfiPhysicalPresenceGuid,
+                      EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
+                      sizeof (UINT8),
+                      &PpiFlags
+                      );
+    if (EFI_ERROR (Status)) {
+      DEBUG ((EFI_D_ERROR, "[TPM] Set physical presence flag failed, Status = %r\n", Status));
+      return ;
     }
-    ASSERT_EFI_ERROR (Status);
   }
-      DEBUG ((EFI_D_ERROR, "[TPM] PpiFlags = %x, Status = %r\n", PpiFlags, Status));
+  DEBUG ((EFI_D_INFO, "[TPM] PpiFlags = %x\n", PpiFlags));
 
   //
   // This flags variable controls whether physical presence is required for TPM command. 
@@ -1205,18 +1209,19 @@ TcgPhysicalPresenceLibProcessRequest (
                   &TcgPpData
                   );
   if (EFI_ERROR (Status)) {
-    if (Status == EFI_NOT_FOUND) {
-      ZeroMem ((VOID*)&TcgPpData, sizeof (TcgPpData));
-      DataSize = sizeof (EFI_PHYSICAL_PRESENCE);
-      Status   = gRT->SetVariable (
-                        PHYSICAL_PRESENCE_VARIABLE,
-                        &gEfiPhysicalPresenceGuid,
-                        EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
-                        DataSize,
-                        &TcgPpData
-                        );
+    ZeroMem ((VOID*)&TcgPpData, sizeof (TcgPpData));
+    DataSize = sizeof (EFI_PHYSICAL_PRESENCE);
+    Status   = gRT->SetVariable (
+                      PHYSICAL_PRESENCE_VARIABLE,
+                      &gEfiPhysicalPresenceGuid,
+                      EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
+                      DataSize,
+                      &TcgPpData
+                      );
+    if (EFI_ERROR (Status)) {
+      DEBUG ((EFI_D_ERROR, "[TPM] Set physical presence variable failed, Status = %r\n", Status));
+      return;
     }
-    ASSERT_EFI_ERROR (Status);
   }
 
   DEBUG ((EFI_D_INFO, "[TPM] Flags=%x, PPRequest=%x\n", PpiFlags, TcgPpData.PPRequest));