From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: michael.a.kubacki@intel.com) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Wed, 11 Sep 2019 23:15:42 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Sep 2019 23:15:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,495,1559545200"; d="scan'208";a="209906798" Received: from orsmsx106.amr.corp.intel.com ([10.22.225.133]) by fmsmga004.fm.intel.com with ESMTP; 11 Sep 2019 23:15:41 -0700 Received: from orsmsx121.amr.corp.intel.com ([169.254.10.57]) by ORSMSX106.amr.corp.intel.com ([169.254.1.16]) with mapi id 14.03.0439.000; Wed, 11 Sep 2019 23:15:41 -0700 From: "Kubacki, Michael A" To: "Zhang, Shenglei" , "devel@edk2.groups.io" CC: "Chiu, Chasel" , "Desimone, Nathaniel L" , "Gao, Liming" Subject: Re: [PATCH v2 1/2] MinPlatformPkg/AcpiTables: Initialize variables before used Thread-Topic: [PATCH v2 1/2] MinPlatformPkg/AcpiTables: Initialize variables before used Thread-Index: AQHVaRoh/pnA+eR+RUum7AX9gxd0EqcnkIkA Date: Thu, 12 Sep 2019 06:15:40 +0000 Message-ID: <49AB4ACB9627B8468F29D589A27B745588ABF536@ORSMSX121.amr.corp.intel.com> References: <20190912032720.38132-1-shenglei.zhang@intel.com> <20190912032720.38132-2-shenglei.zhang@intel.com> In-Reply-To: <20190912032720.38132-2-shenglei.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNWNkYWJmYjItYmNmNi00ZjcwLWI2YmQtMTNiYmFmNzcyYmU2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiVWViQUtLMUFWRXNsVkgxb2ZaSzNCQ2JzVzJcL0NKZmwza1dpYTFsd1RBWG9MOVB3d3FrbDJHc0RMWE9vNEJkTmwifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Michael Kubacki > -----Original Message----- > From: Zhang, Shenglei > Sent: Wednesday, September 11, 2019 8:27 PM > To: devel@edk2.groups.io > Cc: Kubacki, Michael A ; Chiu, Chasel > ; Desimone, Nathaniel L > ; Gao, Liming > Subject: [PATCH v2 1/2] MinPlatformPkg/AcpiTables: Initialize variables > before used >=20 > MadtStructs, NewMadtTable and MaxMadtStructCount are not initialized > before used or at the proper place. So assign values to them at the begin= ning > and change the logic when freeing MadtStructs and NewMadtTable. >=20 > Cc: Michael Kubacki > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Liming Gao > Signed-off-by: Shenglei Zhang > --- > .../Acpi/AcpiTables/AcpiPlatform.c | 21 +++++++++++-------- > 1 file changed, 12 insertions(+), 9 deletions(-) >=20 > 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 >=20 > -Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) 2017-2019, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -867,13 +867,15 @@ InstallMadtFromScratch ( > UINT32 PcIoApicMask; > UINTN PcIoApicIndex; >=20 > + MadtStructs =3D NULL; > + NewMadtTable =3D NULL; > + MaxMadtStructCount =3D 0; > + > DetectApicIdMap(); >=20 > // Call for Local APIC ID Reorder > SortCpuLocalApicInTable (); >=20 > - NewMadtTable =3D NULL; > - > MaxMadtStructCount =3D (UINT32) ( > MAX_CPU_NUM + // processor local APIC structures > MAX_CPU_NUM + // processor local x2APIC structures > @@ -1115,14 +1117,15 @@ Done: > // > // Free memory > // > - for (MadtStructsIndex =3D 0; MadtStructsIndex < MaxMadtStructCount; > MadtStructsIndex++) { > - if (MadtStructs[MadtStructsIndex] !=3D NULL) { > - FreePool (MadtStructs[MadtStructsIndex]); > + if (MadtStructs !=3D NULL){ > + for (MadtStructsIndex =3D 0; MadtStructsIndex < MaxMadtStructCount; > MadtStructsIndex++) { > + if (MadtStructs[MadtStructsIndex] !=3D NULL) { > + FreePool (MadtStructs[MadtStructsIndex]); > + } > } > + FreePool (MadtStructs); > } > - > - FreePool (MadtStructs); > - > + > if (NewMadtTable !=3D NULL) { > FreePool (NewMadtTable); > } > -- > 2.18.0.windows.1