MadtStructs, NewMadtTable and MaxMadtStructCount are not initialized
before used or at the proper place. So assign values to them at the
beginning and change the logic when freeing MadtStructs and
NewMadtTable.
Cc: Michael Kubacki <michael.a.kuba...@intel.com>
Cc: Chasel Chiu <chasel.c...@intel.com>
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zh...@intel.com>
---
.../Acpi/AcpiTables/AcpiPlatform.c | 21 +++++++++++--------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
index 5eb72792..2cc55ee8 100644
--- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
+++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
@@ -1,7 +1,7 @@
/** @file
ACPI Platform Driver
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017-2019, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -867,13 +867,15 @@ InstallMadtFromScratch (
UINT32 PcIoApicMask;
UINTN PcIoApicIndex;
+ MadtStructs = NULL;
+ NewMadtTable = NULL;
+ MaxMadtStructCount = 0;
+
DetectApicIdMap();
// Call for Local APIC ID Reorder
SortCpuLocalApicInTable ();
- NewMadtTable = NULL;
-
MaxMadtStructCount = (UINT32) (
MAX_CPU_NUM + // processor local APIC structures
MAX_CPU_NUM + // processor local x2APIC structures
@@ -1115,14 +1117,15 @@ Done:
//
// Free memory
//
- for (MadtStructsIndex = 0; MadtStructsIndex < MaxMadtStructCount;
MadtStructsIndex++) {
- if (MadtStructs[MadtStructsIndex] != NULL) {
- FreePool (MadtStructs[MadtStructsIndex]);
+ if (MadtStructs != NULL){
+ for (MadtStructsIndex = 0; MadtStructsIndex < MaxMadtStructCount;
MadtStructsIndex++) {
+ if (MadtStructs[MadtStructsIndex] != NULL) {
+ FreePool (MadtStructs[MadtStructsIndex]);
+ }
}
+ FreePool (MadtStructs);
}
-
- FreePool (MadtStructs);
-
+
if (NewMadtTable != NULL) {
FreePool (NewMadtTable);
}
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#47163): https://edk2.groups.io/g/devel/message/47163
Mute This Topic: https://groups.io/mt/34111552/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
