X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=SignedCapsulePkg%2FUniversal%2FSystemFirmwareUpdate%2FSystemFirmwareReportDxe.c;h=e750e5d4ced187f6b944ef78e613cfe2622b4c41;hb=b85b20fba42e25ff658ed1a470250d530c189027;hp=9d5832fed27817a607cae931f308d322ee8f5358;hpb=f6f91d38fe8c91fe4351c8e1319bda258209c346;p=mirror_edk2.git

diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.c
index 9d5832fed2..e750e5d4ce 100644
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.c
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.c
@@ -8,7 +8,7 @@
 
   FmpSetImage() will receive untrusted input and do basic validation.
 
-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2016 - 2018, 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
@@ -58,6 +58,9 @@ DispatchSystemFmpImages (
   EFI_FIRMWARE_VOLUME_HEADER                    *FvImage;
   BOOLEAN                                       Result;
 
+  AuthenticatedImage     = NULL;
+  AuthenticatedImageSize = 0;
+
   DEBUG((DEBUG_INFO, "DispatchSystemFmpImages\n"));
 
   //
@@ -191,9 +194,13 @@ FmpSetImage (
   }
 
   //
-  // Pass Thru
+  // Pass Thru to System FMP Protocol on same handle as FMP Protocol
   //
-  Status = gBS->LocateProtocol(&gSystemFmpProtocolGuid, NULL, (VOID **)&SystemFmp);
+  Status = gBS->HandleProtocol(
+                  SystemFmpPrivate->Handle,
+                  &gSystemFmpProtocolGuid,
+                  (VOID **)&SystemFmp
+                  );
   if (EFI_ERROR(Status)) {
     DEBUG((DEBUG_INFO, "(Agent)SetImage - SystemFmpProtocol - %r\n", Status));
     SystemFmpPrivate->LastAttempt.LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;