From nobody Wed Dec 25 14:26:31 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