From nobody Wed Dec 25 13:44:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1509685088341838.4181997201408; Thu, 2 Nov 2017 21:58:08 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A48C7202E5E7A; Thu, 2 Nov 2017 21:54:10 -0700 (PDT) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 40A11202E5E6A for ; Thu, 2 Nov 2017 21:54:09 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Nov 2017 21:58:03 -0700 Received: from jwang36-mobl2.ccr.corp.intel.com ([10.239.192.100]) by fmsmga006.fm.intel.com with ESMTP; 02 Nov 2017 21:58:02 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=jian.j.wang@intel.com; receiver=edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,336,1505804400"; d="scan'208";a="171412432" From: Jian J Wang To: edk2-devel@lists.01.org Date: Fri, 3 Nov 2017 12:57:57 +0800 Message-Id: <20171103045759.26508-2-jian.j.wang@intel.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20171103045759.26508-1-jian.j.wang@intel.com> References: <20171103045759.26508-1-jian.j.wang@intel.com> Subject: [edk2] [PATCH 1/3] MdeModulePkg: Fix misuses of AllocateCopyPool 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: , Cc: Bi Dandan , Eric Dong , Star Zeng MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" AllocateCopyPool(AllocationSize, *Buffer) will copy "AllocationSize" bytes = of memory from old "Buffer" to new allocated one. If "AllocationSize" is bigger than size of "Buffer", heap memory overflow occurs during copy. The solution is to allocate pool first then copy the necessary bytes to new memory. This can avoid copying extra bytes from unknown memory range. Cc: Star Zeng Cc: Eric Dong Cc: Bi Dandan Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jian J Wang --- MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c | 3 ++- .../BootMaintenanceManagerCustomizedUiSupport.c | 3 ++- MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c | 4 +++- MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 10 ++++++= ---- .../Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c | 3 ++- MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 3 ++- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c = b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c index 1505ef9319..74d890441b 100644 --- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c +++ b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c @@ -639,8 +639,9 @@ UiListThirdPartyDrivers ( =20 Count++; if (Count >=3D CurrentSize) { - DriverListPtr =3D AllocateCopyPool ((Count + UI_HII_DRIVER_LIST_SIZE= ) * sizeof (UI_HII_DRIVER_INSTANCE), gHiiDriverList); + DriverListPtr =3D AllocatePool ((Count + UI_HII_DRIVER_LIST_SIZE) * = sizeof (UI_HII_DRIVER_INSTANCE)); ASSERT (DriverListPtr !=3D NULL); + CopyMem (DriverListPtr, gHiiDriverList, CurrentSize * sizeof (UI_HII= _DRIVER_INSTANCE)); FreePool (gHiiDriverList); gHiiDriverList =3D DriverListPtr; CurrentSize +=3D UI_HII_DRIVER_LIST_SIZE; diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenan= ceManagerCustomizedUiSupport.c b/MdeModulePkg/Library/BootMaintenanceManage= rUiLib/BootMaintenanceManagerCustomizedUiSupport.c index b25bc67c06..512c340741 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManag= erCustomizedUiSupport.c +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManag= erCustomizedUiSupport.c @@ -435,8 +435,9 @@ BmmListThirdPartyDrivers ( =20 Count++; if (Count >=3D CurrentSize) { - DriverListPtr =3D AllocateCopyPool ((Count + UI_HII_DRIVER_LIST_SIZE= ) * sizeof (UI_HII_DRIVER_INSTANCE), gHiiDriverList); + DriverListPtr =3D AllocatePool ((Count + UI_HII_DRIVER_LIST_SIZE) * = sizeof (UI_HII_DRIVER_INSTANCE)); ASSERT (DriverListPtr !=3D NULL); + CopyMem (DriverListPtr, gHiiDriverList, CurrentSize * sizeof (UI_HII= _DRIVER_INSTANCE)); FreePool (gHiiDriverList); gHiiDriverList =3D DriverListPtr; CurrentSize +=3D UI_HII_DRIVER_LIST_SIZE; diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c b/MdeM= odulePkg/Library/DeviceManagerUiLib/DeviceManager.c index 23ae6c5392..8be3e53edf 100644 --- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c +++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c @@ -240,7 +240,9 @@ AddIdToMacDeviceList ( } else { mMacDeviceList.MaxListLen +=3D MAX_MAC_ADDRESS_NODE_LIST_LEN; if (mMacDeviceList.CurListLen !=3D 0) { - TempDeviceList =3D (MENU_INFO_ITEM *)AllocateCopyPool (sizeof (MENU_= INFO_ITEM) * mMacDeviceList.MaxListLen, (VOID *)mMacDeviceList.NodeList); + TempDeviceList =3D (MENU_INFO_ITEM *)AllocatePool (sizeof (MENU_INFO= _ITEM) * mMacDeviceList.MaxListLen); + ASSERT (TempDeviceList !=3D NULL); + CopyMem (TempDeviceList, mMacDeviceList.NodeList, sizeof (MENU_INFO_= ITEM) * mMacDeviceList.CurListLen); } else { TempDeviceList =3D (MENU_INFO_ITEM *)AllocatePool (sizeof (MENU_INFO= _ITEM) * mMacDeviceList.MaxListLen); } diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Librar= y/UefiHiiLib/HiiLib.c index ce894c08b5..d88614fea5 100644 --- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c @@ -464,20 +464,22 @@ HiiGetFormSetFromHiiHandle( } =20 if (FormSetBuffer !=3D NULL){ - TempBuffer =3D AllocateCopyPool (TempSize + ((EFI_IFR_OP_HEADER *)= OpCodeData)->Length, FormSetBuffer); - FreePool(FormSetBuffer); - FormSetBuffer =3D NULL; + TempBuffer =3D AllocatePool (TempSize + ((EFI_IFR_OP_HEADER *) OpC= odeData)->Length); if (TempBuffer =3D=3D NULL) { Status =3D EFI_OUT_OF_RESOURCES; goto Done; } + CopyMem (TempBuffer, FormSetBuffer, TempSize); CopyMem (TempBuffer + TempSize, OpCodeData, ((EFI_IFR_OP_HEADER *= ) OpCodeData)->Length); + FreePool(FormSetBuffer); + FormSetBuffer =3D NULL; } else { - TempBuffer =3D AllocateCopyPool (TempSize + ((EFI_IFR_OP_HEADER *)= OpCodeData)->Length, OpCodeData); + TempBuffer =3D AllocatePool (TempSize + ((EFI_IFR_OP_HEADER *) OpC= odeData)->Length); if (TempBuffer =3D=3D NULL) { Status =3D EFI_OUT_OF_RESOURCES; goto Done; } + CopyMem (TempBuffer, OpCodeData, ((EFI_IFR_OP_HEADER *) OpCodeData= )->Length); } TempSize +=3D ((EFI_IFR_OP_HEADER *) OpCodeData)->Length; FormSetBuffer =3D TempBuffer; diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSyste= m.c b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c index b81110ff98..5bd4c246bc 100644 --- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c +++ b/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c @@ -562,7 +562,8 @@ FvSimpleFileSystemOpen ( // No, there was no extension. So add one and search again for the f= ile // NewFileNameLength =3D FileNameLength + 1 + 4 =3D (Number of non-n= ull character) + (file extension) + (a null character) NewFileNameLength =3D FileNameLength + 1 + 4; - FileNameWithExtension =3D AllocateCopyPool (NewFileNameLength * 2, F= ileName); + FileNameWithExtension =3D AllocatePool (NewFileNameLength * 2); + StrCpyS (FileNameWithExtension, FileNameLength, FileName); StrCatS (FileNameWithExtension, NewFileNameLength, L".EFI"); =20 for (FvFileInfoLink =3D GetFirstNode (&Instance->FileInfoHead); diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b= /MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c index 1b48c1cebe..47173b9c17 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c @@ -2543,10 +2543,11 @@ MergeToMultiKeywordResp ( =20 MultiKeywordRespLen =3D (StrLen (*MultiKeywordResp) + 1 + StrLen (*Keywo= rdResp) + 1) * sizeof (CHAR16); =20 - StringPtr =3D AllocateCopyPool (MultiKeywordRespLen, *MultiKeywordResp); + StringPtr =3D AllocatePool (MultiKeywordRespLen); if (StringPtr =3D=3D NULL) { return EFI_OUT_OF_RESOURCES; } + CopyMem (StringPtr, *MultiKeywordResp, StrSize (*MultiKeywordResp)); =20 FreePool (*MultiKeywordResp); *MultiKeywordResp =3D StringPtr; --=20 2.14.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel