tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dong Guo 2014-03-19 03:12:57 +00:00 committed by gdong1
parent 0e991a2f87
commit 25da08c8b2
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c
View File

@ -15,7 +15,7 @@
They will do basic validation for authentication data structure, then call crypto library They will do basic validation for authentication data structure, then call crypto library
to verify the signature. 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -478,8 +478,8 @@ AddPubKeyInStore (
&mVariableModuleGlobal->VariableGlobal, &mVariableModuleGlobal->VariableGlobal,
FALSE FALSE
); );
ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "Get public key database variable failure, Status = %r\n", Status));
return 0; return 0;
} }
@ -530,8 +530,8 @@ AddPubKeyInStore (
&mVariableModuleGlobal->VariableGlobal, &mVariableModuleGlobal->VariableGlobal,
FALSE FALSE
); );
ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "Get public key database variable failure, Status = %r\n", Status));
return 0; return 0;
} }
@ -562,7 +562,10 @@ AddPubKeyInStore (
&Variable, &Variable,
NULL 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; return Index;

6
SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableDxe.c
View File

@ -3,7 +3,7 @@
and volatile storage space and install variable architecture protocol. and volatile storage space and install variable architecture protocol.
Copyright (C) 2013, Red Hat, Inc. 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -388,7 +388,9 @@ FtwNotificationEvent (
} }
Status = VariableWriteServiceInitialize (); 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. // Install the Variable Write Architectural protocol.

6
SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableSmm.c
View File

@ -14,7 +14,7 @@
VariableServiceSetVariable(), VariableServiceQueryVariableInfo(), ReclaimForOS(), VariableServiceSetVariable(), VariableServiceQueryVariableInfo(), ReclaimForOS(),
SmmVariableGetStatistics() should also do validation based on its own knowledge. 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -848,7 +848,9 @@ SmmFtwNotificationEvent (
mVariableModuleGlobal->FvbInstance = FvbProtocol; mVariableModuleGlobal->FvbInstance = FvbProtocol;
Status = VariableWriteServiceInitialize (); 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 // Notify the variable wrapper driver the variable write service is ready