sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg/UefiHandleParsingLib: Fix error allocate pool

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1965

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 = 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 <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Andrew Fish <afish@apple.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
This commit is contained in:
Zhichao Gao
2019-07-15 14:23:21 +08:00
committed by mergify[bot]
parent 2926498f01
commit 94d4efb54e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
View File

@ -2462,17 +2462,21 @@ InsertNewGuidNameMapping(
IN CONST DUMP_PROTOCOL_INFO DumpFunc OPTIONAL IN CONST DUMP_PROTOCOL_INFO DumpFunc OPTIONAL
) )
{ {
ASSERT(Guid != NULL); ASSERT (Guid != NULL);
ASSERT(NameID != 0); ASSERT (NameID != 0);
mGuidList = ReallocatePool(mGuidListCount * sizeof(GUID_INFO_BLOCK), mGuidListCount+1 * sizeof(GUID_INFO_BLOCK), mGuidList); mGuidList = ReallocatePool (
mGuidListCount * sizeof (GUID_INFO_BLOCK),
(mGuidListCount + 1) * sizeof (GUID_INFO_BLOCK),
mGuidList
);
if (mGuidList == NULL) { if (mGuidList == NULL) {
mGuidListCount = 0; mGuidListCount = 0;
return (EFI_OUT_OF_RESOURCES); return (EFI_OUT_OF_RESOURCES);
} }
mGuidListCount++; mGuidListCount++;
mGuidList[mGuidListCount - 1].GuidId = AllocateCopyPool(sizeof(EFI_GUID), Guid); mGuidList[mGuidListCount - 1].GuidId = AllocateCopyPool (sizeof (EFI_GUID), Guid);
mGuidList[mGuidListCount - 1].StringId = NameID; mGuidList[mGuidListCount - 1].StringId = NameID;
mGuidList[mGuidListCount - 1].DumpInfo = DumpFunc; mGuidList[mGuidListCount - 1].DumpInfo = DumpFunc;