From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 4446B210F1576 for ; Tue, 21 Aug 2018 02:35:20 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Aug 2018 02:35:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,269,1531810800"; d="scan'208";a="64812786" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga008.fm.intel.com with ESMTP; 21 Aug 2018 02:35:16 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 21 Aug 2018 02:35:16 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 21 Aug 2018 02:35:16 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.226]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.143]) with mapi id 14.03.0319.002; Tue, 21 Aug 2018 17:35:15 +0800 From: "Zeng, Star" To: "Dong, Eric" , "edk2-devel@lists.01.org" CC: "Zeng, Star" Thread-Topic: [Patch] MdeModulePkg/PiSmmCore: Check valid memory range. Thread-Index: AQHUORqb+T3VTmVm7UiXdop1yW6ezKTJ8UgQ Date: Tue, 21 Aug 2018 09:35:14 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103BBB032F@shsmsx102.ccr.corp.intel.com> References: <20180821064535.5940-1-eric.dong@intel.com> In-Reply-To: <20180821064535.5940-1-eric.dong@intel.com> Accept-Language: zh-CN, 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 09:35:21 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Eric, About + EFI_PHYSICAL_ADDRESS Last; + Last =3D Memory + EFI_PAGES_TO_SIZE (NumberOfPages); Shouldn't "-1" be also added like the code below in ConvertSmmMemoryMapEntr= y()? EFI_PHYSICAL_ADDRESS End; End =3D Memory + EFI_PAGES_TO_SIZE(NumberOfPages) - 1; Could you double check the normal functionality (SMM AllocatePages + FreePa= ges) with the patch? Thanks, Star -----Original Message----- From: Dong, Eric=20 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. Call BS.AllocatePages in DXE driver and call SMM FreePages with the address= 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. BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1098 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(+) diff --git a/MdeModulePkg/Core/PiSmmCore/Page.c b/MdeModulePkg/Core/PiSmmCo= re/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