[edk2-devel] [PATCH] ShellPkg/UefiHandleParsingLib: Fix error allocate pool
Ni, Ray via Groups.Io
ray.ni=intel.com at groups.io
Thu Nov 28 04:49:59 UTC 2019
Reviewed-by: Ray Ni <ray.ni at intel.com>
> -----Original Message-----
> From: Gao, Zhichao <zhichao.gao at intel.com>
> Sent: Thursday, November 28, 2019 10:23 AM
> To: devel at edk2.groups.io; Gao, Zhichao <zhichao.gao at intel.com>
> Cc: Carsey, Jaben <jaben.carsey at intel.com>; Ni, Ray <ray.ni at intel.com>;
> Andrew Fish <afish at apple.com>
> Subject: RE: [edk2-devel] [PATCH] ShellPkg/UefiHandleParsingLib: Fix error
> allocate pool
>
> Hi Ray,
>
> Can you help to review this patch?
>
> Thanks,
> Zhichao
>
> > -----Original Message-----
> > From: devel at edk2.groups.io [mailto:devel at edk2.groups.io] On Behalf Of
> Gao,
> > Zhichao
> > Sent: Monday, July 15, 2019 3:30 PM
> > To: devel at edk2.groups.io
> > Cc: Carsey, Jaben <jaben.carsey at intel.com>; Ni, Ray <ray.ni at intel.com>;
> > Andrew Fish <afish at apple.com>
> > Subject: [edk2-devel] [PATCH] ShellPkg/UefiHandleParsingLib: Fix error
> allocate
> > pool
> >
> > 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 at intel.com>
> > Cc: Ray Ni <ray.ni at intel.com>
> > Cc: Andrew Fish <afish at apple.com>
> > Signed-off-by: Zhichao Gao <zhichao.gao at intel.com>
> > ---
> > .../UefiHandleParsingLib/UefiHandleParsingLib.c | 12 ++++++++----
> > 1 file changed, 8 insertions(+), 4 deletions(-)
> >
> > diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > index f179c41092..430c0ee70b 100644
> > --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
> > @@ -2462,17 +2462,21 @@ InsertNewGuidNameMapping(
> > IN CONST DUMP_PROTOCOL_INFO DumpFunc OPTIONAL
> > )
> > {
> > - ASSERT(Guid != NULL);
> > - ASSERT(NameID != 0);
> > + ASSERT (Guid != NULL);
> > + 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) {
> > mGuidListCount = 0;
> > return (EFI_OUT_OF_RESOURCES);
> > }
> > 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].DumpInfo = DumpFunc;
> >
> > --
> > 2.21.0.windows.1
> >
> >
> >
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#51439): https://edk2.groups.io/g/devel/message/51439
Mute This Topic: https://groups.io/mt/63589318/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list