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

Pkcs7VerifyDxe: Don't allow Pkcs7Verify to install protocols twice 

This patch makes Pkcs7VerifyDxe check that it has not already been
installed before installing its protocols.  This prevents the case
where loading it as an external driver (either manually, through
Driver#### variables, etc.) will refuse to add a second provider of
the API.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Peter Jones <pjones@redhat.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Long Qin <qin.long@intel.com>
This commit is contained in:
Peter Jones 2017-08-01 10:59:00 +08:00 committed by Long Qin
parent a2481f81b3
commit 56e88e9e5f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SecurityPkg/Pkcs7Verify/Pkcs7VerifyDxe/Pkcs7VerifyDxe.c
View File

@ -1457,8 +1457,17 @@ Pkcs7VerifyDriverEntry (
IN EFI_SYSTEM_TABLE *SystemTable IN EFI_SYSTEM_TABLE *SystemTable
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
EFI_HANDLE Handle; EFI_HANDLE Handle;
EFI_PKCS7_VERIFY_PROTOCOL Useless;
//
// Avoid loading a second copy if this is built as an external module
//
Status = gBS->LocateProtocol (&gEfiPkcs7VerifyProtocolGuid, NULL, (VOID **)&Useless);
if (!EFI_ERROR (Status)) {
return EFI_ABORTED;
}
// //
// Install UEFI Pkcs7 Verification Protocol // Install UEFI Pkcs7 Verification Protocol