From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=eric.dong@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CFE01210F4757 for ; Tue, 21 Aug 2018 05:28:23 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Aug 2018 05:28:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,269,1531810800"; d="scan'208";a="66678444" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga007.jf.intel.com with ESMTP; 21 Aug 2018 05:27:40 -0700 Received: from fmsmsx125.amr.corp.intel.com (10.18.125.40) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 21 Aug 2018 05:27:40 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX125.amr.corp.intel.com (10.18.125.40) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 21 Aug 2018 05:27:40 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.226]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.185]) with mapi id 14.03.0319.002; Tue, 21 Aug 2018 20:27:37 +0800 From: "Dong, Eric" To: "Zeng, Star" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] MdeModulePkg/PiSmmCore: Check valid memory range. Thread-Index: AQHUOTJEd4Kz8SaLR0WqSN6pK856waTKIYLg Date: Tue, 21 Aug 2018 12:27:36 +0000 Message-ID: References: <20180821064535.5940-1-eric.dong@intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103BBB032F@shsmsx102.ccr.corp.intel.com> In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103BBB032F@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] MdeModulePkg/PiSmmCore: Check valid memory range. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Aug 2018 12:28:24 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Star, Good catch. I tried to boot an test platform and it passed. I assume it has= cases to free the smm memory. Seems like actually it doesn't. I will add test code to verify the patch and send v2 change. Thanks, Eric > -----Original Message----- > From: Zeng, Star > Sent: Tuesday, August 21, 2018 5:35 PM > To: Dong, Eric ; edk2-devel@lists.01.org > Cc: Zeng, Star > Subject: RE: [Patch] MdeModulePkg/PiSmmCore: Check valid memory range. >=20 > Hi Eric, >=20 > About > + EFI_PHYSICAL_ADDRESS Last; > + Last =3D Memory + EFI_PAGES_TO_SIZE (NumberOfPages); >=20 > Shouldn't "-1" be also added like the code below in > ConvertSmmMemoryMapEntry()? > EFI_PHYSICAL_ADDRESS End; > End =3D Memory + EFI_PAGES_TO_SIZE(NumberOfPages) - 1; >=20 > Could you double check the normal functionality (SMM AllocatePages + > FreePages) with the patch? >=20 >=20 > Thanks, > Star > -----Original Message----- > From: Dong, Eric > Sent: Tuesday, August 21, 2018 2:46 PM > To: edk2-devel@lists.01.org > Cc: Zeng, Star > Subject: [Patch] MdeModulePkg/PiSmmCore: Check valid memory range. >=20 > Call BS.AllocatePages in DXE driver and call SMM FreePages with the addre= ss > of the buffer allocated in the DXE driver. SMM FreePages success and add = a > non-SMRAM range into SMM heap list. This is not an expected behavior. > SMM FreePages should return error for this case and not free the pages. >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1098 >=20 > Cc: Star Zeng > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Eric Dong > --- > MdeModulePkg/Core/PiSmmCore/Page.c | 39 > ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) >=20 > diff --git a/MdeModulePkg/Core/PiSmmCore/Page.c > b/MdeModulePkg/Core/PiSmmCore/Page.c > index 3699af7424..630678ccc3 100644 > --- a/MdeModulePkg/Core/PiSmmCore/Page.c > +++ b/MdeModulePkg/Core/PiSmmCore/Page.c > @@ -983,6 +983,41 @@ SmmInternalFreePages ( > return SmmInternalFreePagesEx (Memory, NumberOfPages, FALSE); } >=20 > +/** > + Check whether the input range is in smram. > + > + @param Memory Base address of memory being inputed. > + @param NumberOfPages The number of pages. > + > + @retval TRUE In the smram. > + @retval FALSE Not in the smram. > + > +**/ > +BOOLEAN > +InSmmRange ( > + IN EFI_PHYSICAL_ADDRESS Memory, > + IN UINTN NumberOfPages > + ) > +{ > + LIST_ENTRY *Link; > + MEMORY_MAP *Entry; > + EFI_PHYSICAL_ADDRESS Last; > + > + Last =3D Memory + EFI_PAGES_TO_SIZE (NumberOfPages); > + > + Link =3D gMemoryMap.ForwardLink; > + while (Link !=3D &gMemoryMap) { > + Entry =3D CR (Link, MEMORY_MAP, Link, MEMORY_MAP_SIGNATURE); > + Link =3D Link->ForwardLink; > + > + if ((Entry->Start <=3D Memory) && (Entry->End >=3D Last)) { > + return TRUE; > + } > + } > + > + return FALSE; > +} > + > /** > Frees previous allocated pages. >=20 > @@ -1004,6 +1039,10 @@ SmmFreePages ( > EFI_STATUS Status; > BOOLEAN IsGuarded; >=20 > + if (!InSmmRange(Memory, NumberOfPages)) { > + return EFI_NOT_FOUND; > + } > + > IsGuarded =3D IsHeapGuardEnabled () && IsMemoryGuarded (Memory); > Status =3D SmmInternalFreePages (Memory, NumberOfPages, IsGuarded); > if (!EFI_ERROR (Status)) { > -- > 2.15.0.windows.1