From: Michael Kubacki <michael.kuba...@microsoft.com>
The following code accesses array index "6" which is invalid as
the array is of length 6.
DEBUG ((DEBUG_INFO, " %08x %08x %08x %08x %08x %08x",
PciData->Device.Bar[0],
PciData->Device.Bar[1],
PciData->Device.Bar[2],
PciData->Device.Bar[3],
PciData->Device.Bar[4],
PciData->Device.Bar[6] <-- BAD ARRAY INDEX
));
PciData is of type "PCI_TYPE00":
typedef struct {
PCI_DEVICE_INDEPENDENT_REGION Hdr;
PCI_DEVICE_HEADER_TYPE_REGION Device;
} PCI_TYPE00;
"PCI_DEVICE_HEADER_TYPE_REGION":
typedef struct {
UINT32 Bar[6]; <- NOTE: ARRAY LENGTH IS 6
UINT32 CISPtr;
UINT16 SubsystemVendorID;
UINT16 SubsystemID;
UINT32 ExpansionRomBar;
UINT8 CapabilityPtr;
UINT8 Reserved1[3];
UINT32 Reserved2;
UINT8 InterruptLine;
UINT8 InterruptPin;
UINT8 MinGnt;
UINT8 MaxLat;
} PCI_DEVICE_HEADER_TYPE_REGION;
This change fixes the array index value.
Cc: Chasel Chiu <chasel.c...@intel.com>
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
Cc: Isaac Oram <isaac.w.o...@intel.com>
Cc: Liming Gao <gaolim...@byosoft.com.cn>
Cc: Eric Dong <eric.d...@intel.com>
Signed-off-by: Michael Kubacki <michael.kuba...@microsoft.com>
---
Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c | 8
++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
index 514003944758..575284ccc727 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
@@ -75,7 +75,7 @@ DumpPciDevice (
PciData->Device.Bar[2],
PciData->Device.Bar[3],
PciData->Device.Bar[4],
- PciData->Device.Bar[6]
+ PciData->Device.Bar[5]
));
DEBUG ((DEBUG_INFO, " %04x\n",
PciData->Hdr.Command
@@ -256,7 +256,7 @@ TestPointCheckPciResource (
UINT16 MinBus;
UINT16 MaxBus;
BOOLEAN IsEnd;
-
+
DEBUG ((DEBUG_INFO, "==== TestPointCheckPciResource - Enter\n"));
HandleBuf = NULL;
Status = gBS->LocateHandleBuffer (
@@ -338,7 +338,7 @@ TestPointCheckPciResource (
// Device
DumpPciDevice ((UINT8)Bus, (UINT8)Device, (UINT8)Func,
&PciData);
}
-
+
//
// If this is not a multi-function device, we can leave the loop
// to deal with the next device.
@@ -360,7 +360,7 @@ TestPointCheckPciResource (
}
}
}
-
+
Done:
if (HandleBuf != NULL) {
FreePool (HandleBuf);
--
2.28.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93580): https://edk2.groups.io/g/devel/message/93580
Mute This Topic: https://groups.io/mt/93573132/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
