public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH] SignedCapsulePkg SystemFirmwareUpdateDxe: Fix failure caused by d69d922
@ 2018-04-13 10:06 Star Zeng
  2018-04-16  1:49 ` Yao, Jiewen
  0 siblings, 1 reply; 3+ messages in thread
From: Star Zeng @ 2018-04-13 10:06 UTC (permalink / raw)
  To: edk2-devel; +Cc: Star Zeng, Michael D Kinney, Jiewen Yao

d69d9227d046211265de1fab5580c50a65944614 caused system firmware update
failure. It is because FindMatchingFmpHandles() is expected to return
handles matched, but the function returns all handles found.

This patch is to fix the issue.
This patch also assigns mSystemFmpPrivate->Handle for "case 1:" path
in case the Handle is needed by other place in future.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 .../SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c  | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c
index d0b1c9913ca8..fa0c5f03ffdd 100644
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c
@@ -602,6 +602,7 @@ FindMatchingFmpHandles (
   )
 {
   EFI_STATUS                     Status;
+  UINTN                          TempHandleCount;
   EFI_HANDLE                     *HandleBuffer;
   UINTN                          Index;
   UINTN                          Index2;
@@ -613,20 +614,20 @@ FindMatchingFmpHandles (
   BOOLEAN                        MatchFound;
 
   *HandleCount  = 0;
+  TempHandleCount = 0;
   HandleBuffer = NULL;
   Status = gBS->LocateHandleBuffer (
                    ByProtocol,
                    ProtocolGuid,
                    NULL,
-                   HandleCount,
+                   &TempHandleCount,
                    &HandleBuffer
                    );
   if (EFI_ERROR (Status)) {
-    *HandleCount  = 0;
     return NULL;
   }
 
-  for (Index = 0; Index < *HandleCount; Index++) {
+  for (Index = 0; Index < TempHandleCount; Index++) {
     OriginalFmpImageInfoBuf = GetFmpImageDescriptors (
                                 HandleBuffer[Index],
                                 ProtocolGuid,
@@ -657,12 +658,21 @@ FindMatchingFmpHandles (
       //
       FmpImageInfoBuf = (EFI_FIRMWARE_IMAGE_DESCRIPTOR *)(((UINT8 *)FmpImageInfoBuf) + DescriptorSize);
     }
-    if (!MatchFound) {
-      HandleBuffer[Index] = NULL;
+    if (MatchFound) {
+      HandleBuffer[*HandleCount] = HandleBuffer[Index];
+      (*HandleCount)++;
     }
 
     FreePool (OriginalFmpImageInfoBuf);
   }
+
+  if ((*HandleCount) == 0) {
+    //
+    // No any matching handle.
+    //
+    FreePool (HandleBuffer);
+    return NULL;
+  }
   return HandleBuffer;
 }
 
@@ -801,6 +811,7 @@ SystemFirmwareUpdateMainDxe (
     // Install System FMP protocol onto handle with matching FMP Protocol
     //
     DEBUG ((DEBUG_INFO, "SystemFirmwareUpdateDxe: Install System FMP onto matching FMP handle\n"));
+    mSystemFmpPrivate->Handle = HandleBuffer[0];
     Status = gBS->InstallMultipleProtocolInterfaces (
                     &HandleBuffer[0],
                     &gSystemFmpProtocolGuid,
-- 
2.7.0.windows.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-04-16  5:39 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-13 10:06 [PATCH] SignedCapsulePkg SystemFirmwareUpdateDxe: Fix failure caused by d69d922 Star Zeng
2018-04-16  1:49 ` Yao, Jiewen
2018-04-16  5:39   ` Kinney, Michael D

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox