From nobody Sun May 5 05:40:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44096+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44096+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1563778699; cv=none; d=zoho.com; s=zohoarc; b=Q8k5Wc9VW4j73LYu7Eezt4y/tJlohWidMV06hRJpiqCGyANikdcYr8h2j916jxTKBRHSQYAv4Q2b49oHbce2J3E08vcz6qIiyBZafUwNUZTg4DU6+ilPrdi1/nTospCVODFuzR9aRNS9InYSVYwTuf4txsCq4qs7nltuHTO16rY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563778699; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=hEALT45oUGZETEYQst4EJs31i8Dc6EH0oSe/lGmWZOM=; b=RHtEyAkG9pSzfnXPqvIZIli/rLRD9Lcu/jBT8Xhg2vjt7kc9YzdqElstaMSRkBMrqwF9ZWT407ZquxGN4KzYgGgiRuMhvymsdkvrs1Izg66bnoYNJ+0mw3VXT1LpFvC9X8swGgFFWbMjqwh6kYmaMPWUyfGbCuZ3sDXgotx93TE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44096+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15637786991041023.3044190287382; Sun, 21 Jul 2019 23:58:19 -0700 (PDT) Return-Path: X-Received: from mga04.intel.com (mga04.intel.com []) by groups.io with SMTP; Sun, 21 Jul 2019 23:58:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jul 2019 23:58:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,294,1559545200"; d="scan'208";a="188545640" X-Received: from fieedk001.ccr.corp.intel.com ([10.239.33.119]) by fmsmga001.fm.intel.com with ESMTP; 21 Jul 2019 23:58:17 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Jaben Carsey , Ray Ni , Andrew Fish Subject: [edk2-devel] [PATCH V2] ShellPkg/UefiHandleParsingLib: Fix incorrect reallocate pool Date: Mon, 22 Jul 2019 14:57:55 +0800 Message-Id: <20190722065756.18856-2-zhichao.gao@intel.com> In-Reply-To: <20190722065756.18856-1-zhichao.gao@intel.com> References: <20190722065756.18856-1-zhichao.gao@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhichao.gao@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1563778698; bh=OA9PBpD+3Gl/KRweJfbpaQnEG1PW/HsqM5Jj/OSm1b4=; h=Cc:Date:From:Reply-To:Subject:To; b=mXSfkCaatofHqd0+erI8EgHivfae8TXpuNM7LiMtVJdUAYbwhJXkGkugRqXsKtt0EnA LIKX0EW8amgl++7zlHKV0t6HJZMpkr2N/BrnsryBrecMdLpooa3XLO1ofb0rQvED4qvfG uqY9DUy17Dkyai197jX3/i3WA61Hmo3D9Do= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1965 For function InsertNewGuidNameMapping, it rellocate the mGuidList with new size "mGuidListCount+1 * sizeof(GUID_INFO_BLOCK)". That isn't its purpose and would cause a overflow operation in "mGuidList[mGuidListCount - 1].xxx =3D xxx". Its purpose is to increase 1 block size of mGuidList. Change it to "(mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK)". Adjust the coding style of this function. Cc: Jaben Carsey Cc: Ray Ni Cc: Andrew Fish Signed-off-by: Zhichao Gao --- V2: Update the copyright. .../UefiHandleParsingLib/UefiHandleParsingLib.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b= /ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c index f179c41092..43c19b9a91 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c @@ -1,7 +1,7 @@ /** @file Provides interface to advanced shell functionality for parsing both hand= le and protocol database. =20 - Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -2462,17 +2462,21 @@ InsertNewGuidNameMapping( IN CONST DUMP_PROTOCOL_INFO DumpFunc OPTIONAL ) { - ASSERT(Guid !=3D NULL); - ASSERT(NameID !=3D 0); + ASSERT (Guid !=3D NULL); + ASSERT (NameID !=3D 0); =20 - mGuidList =3D ReallocatePool(mGuidListCount * sizeof(GUID_INFO_BLOCK), m= GuidListCount+1 * sizeof(GUID_INFO_BLOCK), mGuidList); + mGuidList =3D ReallocatePool ( + mGuidListCount * sizeof (GUID_INFO_BLOCK), + (mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK), + mGuidList + ); if (mGuidList =3D=3D NULL) { mGuidListCount =3D 0; return (EFI_OUT_OF_RESOURCES); } mGuidListCount++; =20 - mGuidList[mGuidListCount - 1].GuidId =3D AllocateCopyPool(sizeof(EFI_G= UID), Guid); + mGuidList[mGuidListCount - 1].GuidId =3D AllocateCopyPool (sizeof (EFI= _GUID), Guid); mGuidList[mGuidListCount - 1].StringId =3D NameID; mGuidList[mGuidListCount - 1].DumpInfo =3D DumpFunc; =20 --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44096): https://edk2.groups.io/g/devel/message/44096 Mute This Topic: https://groups.io/mt/32556056/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-