1 Signed-off-by: Dean Nelson <dnelson@redhat.com>
2 Reviewed-by: Al Stone <ahs3@redhat.com>
4 source/common/dmtbdump2.c | 11 ++++++-----
5 1 file changed, 6 insertions(+), 5 deletions(-)
7 Index: acpica-unix2-20220331/source/common/dmtbdump2.c
8 ===================================================================
9 --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
10 +++ acpica-unix2-20220331/source/common/dmtbdump2.c
11 @@ -2415,13 +2415,14 @@ AcpiDmDumpPrmt (
12 ACPI_PRMT_MODULE_INFO *PrmtModuleInfo;
13 ACPI_PRMT_HANDLER_INFO *PrmtHandlerInfo;
15 + UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
19 /* Main table header */
21 PrmtHeader = ACPI_ADD_PTR (ACPI_TABLE_PRMT_HEADER, Table, CurrentOffset);
22 - Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHeader,
23 + Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHeader,
24 sizeof (ACPI_TABLE_PRMT_HEADER), AcpiDmTableInfoPrmtHdr);
25 if (ACPI_FAILURE (Status))
27 @@ -2433,20 +2434,20 @@ AcpiDmDumpPrmt (
29 /* PRM Module Information Structure array */
31 - for (i = 0; i < PrmtHeader->ModuleInfoCount; ++i)
32 + for (i = 0; i < AcpiUtReadUint32 (&PrmtHeader->ModuleInfoCount); ++i)
34 PrmtModuleInfo = ACPI_ADD_PTR (ACPI_PRMT_MODULE_INFO, Table, CurrentOffset);
35 - Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtModuleInfo,
36 + Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtModuleInfo,
37 sizeof (ACPI_PRMT_MODULE_INFO), AcpiDmTableInfoPrmtModule);
39 CurrentOffset += sizeof (ACPI_PRMT_MODULE_INFO);
41 /* PRM handler information structure array */
43 - for (j = 0; j < PrmtModuleInfo->HandlerInfoCount; ++j)
44 + for (j = 0; j < AcpiUtReadUint16 (&PrmtModuleInfo->HandlerInfoCount); ++j)
46 PrmtHandlerInfo = ACPI_ADD_PTR (ACPI_PRMT_HANDLER_INFO, Table, CurrentOffset);
47 - Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHandlerInfo,
48 + Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHandlerInfo,
49 sizeof (ACPI_PRMT_HANDLER_INFO), AcpiDmTableInfoPrmtHandler);
51 CurrentOffset += sizeof (ACPI_PRMT_HANDLER_INFO);