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.93; helo=mga11.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org 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 390072034A7C1 for ; Fri, 3 Nov 2017 02:10:17 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Nov 2017 02:14:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,338,1505804400"; d="scan'208";a="331610126" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2017 02:14:11 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 3 Nov 2017 02:14:11 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.175]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002; Fri, 3 Nov 2017 17:14:09 +0800 From: "Zeng, Star" To: "Wang, Jian J" , "edk2-devel@lists.01.org" CC: "Dong, Eric" , "Bi, Dandan" , "Zeng, Star" Thread-Topic: [PATCH 1/3] MdeModulePkg: Fix misuses of AllocateCopyPool Thread-Index: AQHTVGBXINsGHW2d1EW+BLk+GCmcvKMCXZcQ Date: Fri, 3 Nov 2017 09:14:09 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103B9B1686@shsmsx102.ccr.corp.intel.com> References: <20171103045759.26508-1-jian.j.wang@intel.com> <20171103045759.26508-2-jian.j.wang@intel.com> In-Reply-To: <20171103045759.26508-2-jian.j.wang@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 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: , X-List-Received-Date: Fri, 03 Nov 2017 09:10:17 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Some of the change can reuse ReallocatePool() to make the code more simpler= . For example, the change in FrontPageCustomizedUiSupport.c. Count++; if (Count >=3D CurrentSize) { DriverListPtr =3D AllocatePool ((Count + UI_HII_DRIVER_LIST_SIZE) * s= izeof (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; Could be Count++; if (Count >=3D CurrentSize) { gHiiDriverList =3D ReallocatePool ( CurrentSize * sizeof (UI_HII_DRIVER_INSTANCE), (CurrentSize + UI_HII_DRIVER_LIST_SIZE) * sizeof (= UI_HII_DRIVER_INSTANCE), gHiiDriverList ); ASSERT (gHiiDriverList !=3D NULL); CurrentSize +=3D UI_HII_DRIVER_LIST_SIZE; Thanks, Star -----Original Message----- From: Wang, Jian J=20 Sent: Friday, November 3, 2017 12:58 PM To: edk2-devel@lists.01.org Cc: Zeng, Star ; Dong, Eric ; Bi,= Dandan Subject: [PATCH 1/3] MdeModulePkg: Fix misuses of AllocateCopyPool AllocateCopyPool(AllocationSize, *Buffer) will copy "AllocationSize" bytes = of memory from old "Buffer" to new allocated one. If "AllocationSize" is bigge= r 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