Fix the return value bug when updating public key database variable failure.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dong Guo <guo.dong@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15339 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 15 insertions, 8 deletions

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
index ee45ec977..3db3d29e6 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
@@ -15,7 +15,7 @@
   They will do basic validation for authentication data structure, then call crypto library

   to verify the signature.

 

-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2009 - 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

@@ -478,8 +478,8 @@ AddPubKeyInStore (
              &mVariableModuleGlobal->VariableGlobal,

              FALSE

              );

-  ASSERT_EFI_ERROR (Status);

   if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "Get public key database variable failure, Status = %r\n", Status));

     return 0;

   }

 

@@ -530,8 +530,8 @@ AddPubKeyInStore (
                  &mVariableModuleGlobal->VariableGlobal,

                  FALSE

                  );

-      ASSERT_EFI_ERROR (Status);

       if (EFI_ERROR (Status)) {

+        DEBUG ((EFI_D_ERROR, "Get public key database variable failure, Status = %r\n", Status));

         return 0;

       }

 

@@ -562,7 +562,10 @@ AddPubKeyInStore (
                &Variable,

                NULL

                );

-    ASSERT_EFI_ERROR (Status);

+    if (EFI_ERROR (Status)) {

+      DEBUG ((EFI_D_ERROR, "Update public key database variable failure, Status = %r\n", Status));

+      return 0;

+    }

   }

 

   return Index;

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableDxe.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableDxe.c
index 1d71e4f80..949fb6424 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableDxe.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableDxe.c
@@ -3,7 +3,7 @@
   and volatile storage space and install variable architecture protocol.

 

 Copyright (C) 2013, Red Hat, Inc.

-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2009 - 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

@@ -388,7 +388,9 @@ FtwNotificationEvent (
   }

 

   Status = VariableWriteServiceInitialize ();

-  ASSERT_EFI_ERROR (Status);

+  if (EFI_ERROR (Status)) {

+    DEBUG ((DEBUG_ERROR, "Variable write service initialization failed. Status = %r\n", Status));

+  }

 

   //

   // Install the Variable Write Architectural protocol.

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmm.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmm.c
index 4ac582d49..63ac43615 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmm.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmm.c
@@ -14,7 +14,7 @@
   VariableServiceSetVariable(), VariableServiceQueryVariableInfo(), ReclaimForOS(), 

   SmmVariableGetStatistics() should also do validation based on its own knowledge.

 

-Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2010 - 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 

@@ -848,7 +848,9 @@ SmmFtwNotificationEvent (
   mVariableModuleGlobal->FvbInstance = FvbProtocol;

   

   Status = VariableWriteServiceInitialize ();

-  ASSERT_EFI_ERROR (Status);

+  if (EFI_ERROR (Status)) {

+    DEBUG ((DEBUG_ERROR, "Variable write service initialization failed. Status = %r\n", Status));

+  }

  

   //

   // Notify the variable wrapper driver the variable write service is ready