sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg/DxeCapsuleLibFmp: Verify nested capsule with FMP

Browse Source 
https://bugzilla.tianocore.org/show_bug.cgi?id=873

Update IsNestedFmpCapsule() to verify the CapsuleGuid in
the CapsuleHeader against the installed Firmware Management
Protocol instances.  The current logic that uses the ESRT
Table does not work because capsules are processed before
the ESRT Table is published at the Ready To Boot event.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Bret Barkelew <Bret.Barkelew@microsoft.com>
(cherry picked from commit 7f0301e39a)
This commit is contained in:
Kinney, Michael D
2018-02-06 17:43:32 -08:00
committed by Star Zeng
parent 40c6dc594e
commit ece2cc8ed7
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
View File

@ -1446,7 +1446,6 @@ IsNestedFmpCapsule (
)
{
EFI_STATUS Status;
EFI_SYSTEM_RESOURCE_TABLE *Esrt;
EFI_SYSTEM_RESOURCE_ENTRY *EsrtEntry;
UINTN Index;
BOOLEAN EsrtGuidFound;
@ -1454,6 +1453,8 @@ IsNestedFmpCapsule (
UINTN NestedCapsuleSize;
ESRT_MANAGEMENT_PROTOCOL *EsrtProtocol;
EFI_SYSTEM_RESOURCE_ENTRY Entry;
EFI_HANDLE *HandleBuffer;
UINTN NumberOfHandles;
EsrtGuidFound = FALSE;
if (mIsVirtualAddrConverted) {
@ -1479,19 +1480,21 @@ IsNestedFmpCapsule (
}
//
// Check ESRT configuration table
// Check Firmware Management Protocols
//
if (!EsrtGuidFound) {
Status = EfiGetSystemConfigurationTable(&gEfiSystemResourceTableGuid, (VOID **)&Esrt);
HandleBuffer = NULL;
Status = GetFmpHandleBufferByType (
&CapsuleHeader->CapsuleGuid,
0,
&NumberOfHandles,
&HandleBuffer
);
if (!EFI_ERROR(Status)) {
ASSERT (Esrt != NULL);
EsrtEntry = (VOID *)(Esrt + 1);
for (Index = 0; Index < Esrt->FwResourceCount; Index++, EsrtEntry++) {
if (CompareGuid(&EsrtEntry->FwClass, &CapsuleHeader->CapsuleGuid)) {
EsrtGuidFound = TRUE;
break;
}
}
EsrtGuidFound = TRUE;
}
if (HandleBuffer != NULL) {
FreePool (HandleBuffer);
}
}
}