From nobody Wed Dec 25 14:28:22 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