Thank Dun for the fix.
Reviewed-by: Zhiguang Liu <zhiguang....@intel.com>
________________________________
From: Tan, Dun <dun....@intel.com>
Sent: Tuesday, August 31, 2021 13:38
To: devel@edk2.groups.io <devel@edk2.groups.io>
Cc: Dong, Guo <guo.d...@intel.com>; Ni, Ray <ray...@intel.com>; Ma, Maurice
<maurice...@intel.com>; You, Benjamin <benjamin....@intel.com>; Liu, Zhiguang
<zhiguang....@intel.com>; Tan, Dun <dun....@intel.com>
Subject: [Patch V2 1/2] UefiPayloadPkg: Fix the bug in dump guid HOB info
functions
The input HobLength of PrintHandler should be data size instead of whole length
of HOB
Cc: Guo Dong <guo.d...@intel.com>
Cc: Ray Ni <ray...@intel.com>
Cc: Maurice Ma <maurice...@intel.com>
Cc: Benjamin You <benjamin....@intel.com>
Cc: Zhiguang Liu <zhiguang....@intel.com>
Signed-off-by: DunTan <dun....@intel.com>
---
UefiPayloadPkg/UefiPayloadEntry/PrintHob.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c
b/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c
index 5fb638d4a4..f93aeec472 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c
@@ -317,9 +317,11 @@ PrintPciRootBridgeInfoGuidHob (
{
UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES *PciRootBridges;
UINTN Index;
+ UINTN Length;
Index = 0;
PciRootBridges = (UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES *) GET_GUID_HOB_DATA
(HobRaw);
- ASSERT (HobLength >= sizeof (UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES));
+ Length = sizeof (UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES) + PciRootBridges->Count
* sizeof (UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE);
+ ASSERT (HobLength >= Length);
DEBUG ((DEBUG_INFO, " Revision = 0x%x\n",
PciRootBridges->Header.Revision));
DEBUG ((DEBUG_INFO, " Length = 0x%x\n",
PciRootBridges->Header.Length));
DEBUG ((DEBUG_INFO, " Count = 0x%x\n", PciRootBridges->Count));
@@ -369,10 +371,12 @@ PrintExtraDataGuidHob (
{
UNIVERSAL_PAYLOAD_EXTRA_DATA *ExtraData;
UINTN Index;
+ UINTN Length;
Index = 0;
ExtraData = (UNIVERSAL_PAYLOAD_EXTRA_DATA *) GET_GUID_HOB_DATA (HobRaw);
- ASSERT (HobLength >= ExtraData->Header.Length);
+ Length = sizeof (UNIVERSAL_PAYLOAD_EXTRA_DATA) + ExtraData->Count * sizeof
(UNIVERSAL_PAYLOAD_EXTRA_DATA_ENTRY);
+ ASSERT (HobLength >= Length);
DEBUG ((DEBUG_INFO, " Revision = 0x%x\n", ExtraData->Header.Revision));
DEBUG ((DEBUG_INFO, " Length = 0x%x\n", ExtraData->Header.Length));
DEBUG ((DEBUG_INFO, " Count = 0x%x\n", ExtraData->Count));
@@ -443,7 +447,7 @@ PrintGuidHob (
for (Index = 0; Index < ARRAY_SIZE (GuidHobPrintHandleTable); Index++) {
if (CompareGuid (&Hob.Guid->Name, GuidHobPrintHandleTable[Index].Guid)) {
DEBUG ((DEBUG_INFO, " Guid = %a\n",
GuidHobPrintHandleTable[Index].GuidName));
- Status = GuidHobPrintHandleTable[Index].PrintHandler (Hob.Raw,
Hob.Header->HobLength);
+ Status = GuidHobPrintHandleTable[Index].PrintHandler (Hob.Raw,
GET_GUID_HOB_DATA_SIZE (Hob.Raw));
return Status;
}
}
--
2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#80392): https://edk2.groups.io/g/devel/message/80392
Mute This Topic: https://groups.io/mt/85270356/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
