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

SignedCapsulePkg SystemFirmwareUpdateDxe: Fix failure caused by d69d922 

d69d9227d0 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>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
This commit is contained in:
Star Zeng 2018-04-13 17:55:14 +08:00
parent b85b20fba4
commit 665bfd41ac
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c
View File

@ -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,