Reviewed-by: Jaben Carsey <[email protected]>
> -----Original Message----- > From: edk2-devel [mailto:[email protected]] On Behalf Of Qiu > Shumin > Sent: Monday, February 15, 2016 6:07 PM > To: [email protected] > Cc: Carsey, Jaben <[email protected]>; Qiu, Shumin > <[email protected]> > Subject: [edk2] [PATCH] ShellPkg: Do NULL pointer check before the pointer > is used. > Importance: High > > The pointer 'FileInterface->Buffer' returned from 'AllocateZeroPool' in > function > 'CreateFileInterfaceMem' may be NULL and will be dereferenced at the > following code. > > Cc: Jaben Carsey <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Qiu Shumin <[email protected]> > --- > ShellPkg/Application/Shell/FileHandleWrappers.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/ShellPkg/Application/Shell/FileHandleWrappers.c > b/ShellPkg/Application/Shell/FileHandleWrappers.c > index 168b78b..f8306e2 100644 > --- a/ShellPkg/Application/Shell/FileHandleWrappers.c > +++ b/ShellPkg/Application/Shell/FileHandleWrappers.c > @@ -3,7 +3,7 @@ > StdIn, StdOut, StdErr, etc...). > > Copyright 2016 Dell Inc. > - Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR> > (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR> > This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD > License > @@ -1516,6 +1516,10 @@ CreateFileInterfaceMem( > > if (Unicode) { > FileInterface->Buffer = AllocateZeroPool(sizeof(gUnicodeFileTag)); > + if (FileInterface->Buffer == NULL) { > + FreePool (FileInterface); > + return NULL; > + } > *((CHAR16 *) (FileInterface->Buffer)) = EFI_UNICODE_BYTE_ORDER_MARK; > FileInterface->BufferSize = 2; > FileInterface->Position = 2; > -- > 1.9.5.msysgit.1 > > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
