From nobody Wed Dec 25 02:16:53 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 151010713266943.343170406023205; Tue, 7 Nov 2017 18:12:12 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C849B2035520D; Tue, 7 Nov 2017 18:08:09 -0800 (PST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 11B4920355206 for ; Tue, 7 Nov 2017 18:08:08 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Nov 2017 18:12:06 -0800 Received: from jwang36-mobl2.ccr.corp.intel.com ([10.239.192.49]) by fmsmga002.fm.intel.com with ESMTP; 07 Nov 2017 18:12:05 -0800 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=134.134.136.24; helo=mga09.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,361,1505804400"; d="scan'208";a="1241185273" From: Jian J Wang To: edk2-devel@lists.01.org Date: Wed, 8 Nov 2017 10:11:59 +0800 Message-Id: <20171108021201.17436-2-jian.j.wang@intel.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20171108021201.17436-1-jian.j.wang@intel.com> References: <20171108021201.17436-1-jian.j.wang@intel.com> Subject: [edk2] [PATCH v3 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" >v3: > a. Add ASSERT for returned pointer > b. Correct DestMax parameter in calling StrCpyS > c. Fix coding style >v2: > a. Use ReallocatePool to replace AllocateCopyPool wherever applicable. 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. One solution is to allocate pool first then copy the necessary bytes to new memory. Another is using ReallocatePool instead if old buffer will be freed on spot. Cc: Star Zeng Cc: Eric Dong Cc: Bi Dandan Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jian J Wang Reviewed-by: Star Zeng --- .../Application/UiApp/FrontPageCustomizedUiSupport.c | 8 ++++++-- .../BootMaintenanceManagerCustomizedUiSupport.c | 8 ++++++-- MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c | 10 +++++---= -- MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 12 ++++++++= ---- .../Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c | 3 ++- MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 9 ++++++--- 6 files changed, 33 insertions(+), 17 deletions(-) diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c = b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c index 1505ef9319..17fc3db507 100644 --- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c +++ b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c @@ -639,9 +639,13 @@ UiListThirdPartyDrivers ( =20 Count++; if (Count >=3D CurrentSize) { - DriverListPtr =3D AllocateCopyPool ((Count + UI_HII_DRIVER_LIST_SIZE= ) * sizeof (UI_HII_DRIVER_INSTANCE), gHiiDriverList); + DriverListPtr =3D ReallocatePool ( + CurrentSize * sizeof (UI_HII_DRIVER_INSTANCE), + (Count + UI_HII_DRIVER_LIST_SIZE) + * sizeof (UI_HII_DRIVER_INSTANCE), + gHiiDriverList + ); ASSERT (DriverListPtr !=3D NULL); - 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..6dd4fce139 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManag= erCustomizedUiSupport.c +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManag= erCustomizedUiSupport.c @@ -435,9 +435,13 @@ BmmListThirdPartyDrivers ( =20 Count++; if (Count >=3D CurrentSize) { - DriverListPtr =3D AllocateCopyPool ((Count + UI_HII_DRIVER_LIST_SIZE= ) * sizeof (UI_HII_DRIVER_INSTANCE), gHiiDriverList); + DriverListPtr =3D ReallocatePool ( + CurrentSize * sizeof (UI_HII_DRIVER_INSTANCE), + (Count + UI_HII_DRIVER_LIST_SIZE) + * sizeof (UI_HII_DRIVER_INSTANCE), + gHiiDriverList + ); ASSERT (DriverListPtr !=3D NULL); - 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..ac8a975bf6 100644 --- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c +++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c @@ -240,7 +240,11 @@ 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 ReallocatePool ( + sizeof (MENU_INFO_ITEM) * mMacDeviceList.CurListL= en, + sizeof (MENU_INFO_ITEM) * mMacDeviceList.MaxListL= en, + mMacDeviceList.NodeList + ); } else { TempDeviceList =3D (MENU_INFO_ITEM *)AllocatePool (sizeof (MENU_INFO= _ITEM) * mMacDeviceList.MaxListLen); } @@ -251,10 +255,6 @@ AddIdToMacDeviceList ( TempDeviceList[mMacDeviceList.CurListLen].PromptId =3D PromptId; =20 TempDeviceList[mMacDeviceList.CurListLen].QuestionId =3D (EFI_QUESTION= _ID) (mMacDeviceList.CurListLen + NETWORK_DEVICE_LIST_KEY_OFFSET); =20 - if (mMacDeviceList.CurListLen > 0) { - FreePool(mMacDeviceList.NodeList); - } - mMacDeviceList.NodeList =3D TempDeviceList; } mMacDeviceList.CurListLen ++; diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Librar= y/UefiHiiLib/HiiLib.c index ce894c08b5..f9b8c3df27 100644 --- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c @@ -464,20 +464,24 @@ HiiGetFormSetFromHiiHandle( } =20 if (FormSetBuffer !=3D NULL){ - TempBuffer =3D AllocateCopyPool (TempSize + ((EFI_IFR_OP_HEADER *)= OpCodeData)->Length, FormSetBuffer); - FreePool(FormSetBuffer); - FormSetBuffer =3D NULL; + TempBuffer =3D ReallocatePool ( + TempSize, + TempSize + ((EFI_IFR_OP_HEADER *) OpCodeData)->Leng= th, + FormSetBuffer + ); if (TempBuffer =3D=3D NULL) { Status =3D EFI_OUT_OF_RESOURCES; goto Done; } CopyMem (TempBuffer + TempSize, OpCodeData, ((EFI_IFR_OP_HEADER *= ) OpCodeData)->Length); + 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..e39036aed9 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, NewFileNameLength, 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..5d5f17fb17 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c @@ -2543,12 +2543,15 @@ MergeToMultiKeywordResp ( =20 MultiKeywordRespLen =3D (StrLen (*MultiKeywordResp) + 1 + StrLen (*Keywo= rdResp) + 1) * sizeof (CHAR16); =20 - StringPtr =3D AllocateCopyPool (MultiKeywordRespLen, *MultiKeywordResp); + StringPtr =3D ReallocatePool ( + StrSize (*MultiKeywordResp), + MultiKeywordRespLen, + *MultiKeywordResp + ); if (StringPtr =3D=3D NULL) { return EFI_OUT_OF_RESOURCES; } - =20 - FreePool (*MultiKeywordResp); + *MultiKeywordResp =3D StringPtr; =20 StrCatS (StringPtr, MultiKeywordRespLen / sizeof (CHAR16), L"&"); --=20 2.14.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Wed Dec 25 02:16:53 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 1510107137471963.3865947779531; Tue, 7 Nov 2017 18:12:17 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1288921CEB12B; Tue, 7 Nov 2017 18:08:10 -0800 (PST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 150B120355208 for ; Tue, 7 Nov 2017 18:08:08 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Nov 2017 18:12:07 -0800 Received: from jwang36-mobl2.ccr.corp.intel.com ([10.239.192.49]) by fmsmga002.fm.intel.com with ESMTP; 07 Nov 2017 18:12:06 -0800 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=134.134.136.24; helo=mga09.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,361,1505804400"; d="scan'208";a="1241185283" From: Jian J Wang To: edk2-devel@lists.01.org Date: Wed, 8 Nov 2017 10:12:00 +0800 Message-Id: <20171108021201.17436-3-jian.j.wang@intel.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20171108021201.17436-1-jian.j.wang@intel.com> References: <20171108021201.17436-1-jian.j.wang@intel.com> Subject: [edk2] [PATCH v3 2/3] ShellPkg: 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: Jaben Carsey , Ruiyu Ni , Bi Dandan 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" > v3: > No update > v2: > a. Use ReallocatePool instead of allocating then copying wherever applica= ble 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. One solution is to allocate pool first then copy the necessary bytes to new memory. Another is using ReallocatePool instead if old buffer will be freed on spot. Cc: Jaben Carsey Cc: Ruiyu Ni Cc: Bi Dandan Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jian J Wang --- ShellPkg/Application/Shell/Shell.c | 4 +++- ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c | 7 +++= ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shel= l/Shell.c index 5471930ba1..656206fdce 100644 --- a/ShellPkg/Application/Shell/Shell.c +++ b/ShellPkg/Application/Shell/Shell.c @@ -1646,7 +1646,7 @@ ShellConvertVariables ( // // now do the replacements... // - NewCommandLine1 =3D AllocateCopyPool(NewSize, OriginalCommandLine); + NewCommandLine1 =3D AllocateZeroPool (NewSize); NewCommandLine2 =3D AllocateZeroPool(NewSize); ItemTemp =3D AllocateZeroPool(ItemSize+(2*sizeof(CHAR16))); if (NewCommandLine1 =3D=3D NULL || NewCommandLine2 =3D=3D NULL || ItemTe= mp =3D=3D NULL) { @@ -1655,6 +1655,8 @@ ShellConvertVariables ( SHELL_FREE_NON_NULL(ItemTemp); return (NULL); } + CopyMem (NewCommandLine1, OriginalCommandLine, StrSize (OriginalCommandL= ine)); + for (MasterEnvList =3D EfiShellGetEnv(NULL) ; MasterEnvList !=3D NULL && *MasterEnvList !=3D CHAR_NULL ; MasterEnvList +=3D StrLen(MasterEnvList) + 1 diff --git a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandL= ib.c b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c index 1122c89b8b..ee3db63358 100644 --- a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c +++ b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c @@ -143,10 +143,11 @@ UpdateOptionalData( OriginalOptionDataSize +=3D (*(UINT16*)(OriginalData + sizeof(UINT32))= ); OriginalOptionDataSize -=3D OriginalSize; NewSize =3D OriginalSize - OriginalOptionDataSize + DataSize; - NewData =3D AllocateCopyPool(NewSize, OriginalData); + NewData =3D AllocatePool(NewSize); if (NewData =3D=3D NULL) { Status =3D EFI_OUT_OF_RESOURCES; } else { + CopyMem (NewData, OriginalData, OriginalSize - OriginalOptionDataSiz= e); CopyMem(NewData + OriginalSize - OriginalOptionDataSize, Data, DataS= ize); } } @@ -1120,11 +1121,13 @@ BcfgAddOpt( // Now we know how many EFI_INPUT_KEY structs we need to attach to= the end of the EFI_KEY_OPTION struct. =20 // Re-allocate with the added information. // - KeyOptionBuffer =3D AllocateCopyPool(sizeof(EFI_KEY_OPTION) + (siz= eof(EFI_INPUT_KEY) * NewKeyOption.KeyData.Options.InputKeyCount), &NewKeyOp= tion); + KeyOptionBuffer =3D AllocatePool (sizeof(EFI_KEY_OPTION) + (sizeof= (EFI_INPUT_KEY) * NewKeyOption.KeyData.Options.InputKeyCount)); if (KeyOptionBuffer =3D=3D NULL) { ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gSh= ellBcfgHiiHandle, L"bcfg"); =20 ShellStatus =3D SHELL_OUT_OF_RESOURCES; + return ShellStatus; } + CopyMem (KeyOptionBuffer, &NewKeyOption, sizeof(EFI_KEY_OPTION)); } for (LoopCounter =3D 0 ; ShellStatus =3D=3D SHELL_SUCCESS && LoopCou= nter < NewKeyOption.KeyData.Options.InputKeyCount; LoopCounter++) { // --=20 2.14.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Wed Dec 25 02:16:53 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 151010713757841.13176750051923; Tue, 7 Nov 2017 18:12:17 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5AFE220355213; Tue, 7 Nov 2017 18:08:10 -0800 (PST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 13BB420355202 for ; Tue, 7 Nov 2017 18:08:09 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Nov 2017 18:12:09 -0800 Received: from jwang36-mobl2.ccr.corp.intel.com ([10.239.192.49]) by fmsmga002.fm.intel.com with ESMTP; 07 Nov 2017 18:12:07 -0800 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=134.134.136.24; helo=mga09.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,361,1505804400"; d="scan'208";a="1241185292" From: Jian J Wang To: edk2-devel@lists.01.org Date: Wed, 8 Nov 2017 10:12:01 +0800 Message-Id: <20171108021201.17436-4-jian.j.wang@intel.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20171108021201.17436-1-jian.j.wang@intel.com> References: <20171108021201.17436-1-jian.j.wang@intel.com> Subject: [edk2] [PATCH v3 3/3] IntelFrameworkModulePkg: 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 , Liming Gao 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" > v3: > No updates. > v2: > a. Use ReallocatePool instead of allocating then copying wherever applica= ble 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. One solution is to allocate pool first then copy the necessary bytes to new memory. Another is using ReallocatePool instead if old buffer will be freed on spot. Cc: Liming Gao Cc: Bi Dandan Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jian J Wang Reviewed-by: Dandan Bi --- .../Universal/BdsDxe/DeviceMngr/DeviceManager.c | 10 +++++-= ---- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceMana= ger.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c index 125c49db5e..5103c7e5d1 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c @@ -480,7 +480,11 @@ 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 ReallocatePool ( + sizeof (MENU_INFO_ITEM) * mMacDeviceList.CurListL= en, + sizeof (MENU_INFO_ITEM) * mMacDeviceList.MaxListL= en, + mMacDeviceList.NodeList + ); } else { TempDeviceList =3D (MENU_INFO_ITEM *)AllocatePool (sizeof (MENU_INFO= _ITEM) * mMacDeviceList.MaxListLen); } @@ -491,10 +495,6 @@ AddIdToMacDeviceList ( TempDeviceList[mMacDeviceList.CurListLen].PromptId =3D PromptId; =20 TempDeviceList[mMacDeviceList.CurListLen].QuestionId =3D (EFI_QUESTION= _ID) (mMacDeviceList.CurListLen + NETWORK_DEVICE_LIST_KEY_OFFSET); =20 - if (mMacDeviceList.CurListLen > 0) { - FreePool(mMacDeviceList.NodeList); - } - =20 mMacDeviceList.NodeList =3D TempDeviceList; } mMacDeviceList.CurListLen ++; --=20 2.14.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel