From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 95F6521CF94ED for ; Mon, 31 Jul 2017 00:45:35 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Jul 2017 00:47:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,441,1496127600"; d="scan'208";a="999040737" Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.9.12]) by orsmga003.jf.intel.com with ESMTP; 31 Jul 2017 00:47:31 -0700 From: Star Zeng To: edk2-devel@lists.01.org Cc: Star Zeng , Liming Gao , Jiewen Yao Date: Mon, 31 Jul 2017 15:47:20 +0800 Message-Id: <1501487240-37524-1-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 Subject: [PATCH] MdeModulePkg PiSmmCoreMemoryAllocLib: Fix a FreePool() assertion issue X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2017 07:45:35 -0000 When PiSmmCore links against PeiDxeDebugLibReportStatusCode, the code flow below will cause a FreePool() assertion issue. PiSmmCoreMemoryAllocationLibConstructor() -> SmmInitializeMemoryServices() -> DEBUG ((DEBUG_INFO, "SmmAddMemoryRegion\n")) in SmmAddMemoryRegion() -> DebugPrint() -> REPORT_STATUS_CODE_EX() -> ReportStatusCodeEx() -> AllocatePool()/FreePool(PiSmmCoreMemoryAllocLib) -> ASSERT() at Head = CR (Buffer, POOL_HEAD, Data, POOL_HEAD_SIGNATURE) in CoreFreePoolI() of DxeCore Pool.c It is because at the point of FreePool() in the code flow above, mSmmCoreMemoryAllocLibSmramRanges/mSmmCoreMemoryAllocLibSmramRangeCount are not been initialized yet, the FreePool() will be directed to gBS->FreePool(), that is wrong. This patch is to temporarily use BootServicesData to hold the SmramRanges data before calling SmmInitializeMemoryServices(). Cc: Liming Gao Cc: Jiewen Yao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng --- .../MemoryAllocationLib.c | 32 +++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c index 96cb275cc9d7..4216a12d18f5 100644 --- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c +++ b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c @@ -1068,20 +1068,44 @@ PiSmmCoreMemoryAllocationLibConstructor ( IN EFI_SYSTEM_TABLE *SystemTable ) { + EFI_STATUS Status; SMM_CORE_PRIVATE_DATA *SmmCorePrivate; UINTN Size; + VOID *BootServicesData; SmmCorePrivate = (SMM_CORE_PRIVATE_DATA *)ImageHandle; + // - // Initialize memory service using free SMRAM + // The FreePool()/FreePages() will need use SmramRanges data to know whether + // the buffer to free is in SMRAM range or not. And there may be FreePool()/ + // FreePages() indrectly during calling SmmInitializeMemoryServices(), but + // no SMRAM could be allocated before calling SmmInitializeMemoryServices(), + // so temporarily use BootServicesData to hold the SmramRanges data. // - SmmInitializeMemoryServices (SmmCorePrivate->SmramRangeCount, SmmCorePrivate->SmramRanges); - mSmmCoreMemoryAllocLibSmramRangeCount = SmmCorePrivate->SmramRangeCount; Size = mSmmCoreMemoryAllocLibSmramRangeCount * sizeof (EFI_SMRAM_DESCRIPTOR); - mSmmCoreMemoryAllocLibSmramRanges = (EFI_SMRAM_DESCRIPTOR *) AllocatePool (Size); + Status = gBS->AllocatePool (EfiBootServicesData, Size, (VOID **) &mSmmCoreMemoryAllocLibSmramRanges); + ASSERT_EFI_ERROR (Status); ASSERT (mSmmCoreMemoryAllocLibSmramRanges != NULL); CopyMem (mSmmCoreMemoryAllocLibSmramRanges, SmmCorePrivate->SmramRanges, Size); + // + // Initialize memory service using free SMRAM + // + SmmInitializeMemoryServices (SmmCorePrivate->SmramRangeCount, SmmCorePrivate->SmramRanges); + + // + // Move the SmramRanges data from BootServicesData to SMRAM. + // + BootServicesData = mSmmCoreMemoryAllocLibSmramRanges; + mSmmCoreMemoryAllocLibSmramRanges = (EFI_SMRAM_DESCRIPTOR *) AllocateCopyPool (Size, (VOID *) BootServicesData); + ASSERT (mSmmCoreMemoryAllocLibSmramRanges != NULL); + + // + // Free the temporarily used BootServicesData. + // + Status = gBS->FreePool (BootServicesData); + ASSERT_EFI_ERROR (Status); + return EFI_SUCCESS; } -- 2.7.0.windows.1