Reviewed-by: Hao A Wu <hao.a...@intel.com> Best Regards, Hao Wu
> -----Original Message----- > From: Ranbir Singh <rsi...@ventanamicro.com> > Sent: Monday, July 3, 2023 7:44 PM > To: devel@edk2.groups.io; rsi...@ventanamicro.com > Cc: Wu, Hao A <hao.a...@intel.com>; Ni, Ray <ray...@intel.com> > Subject: [PATCH 1/1] MdeModulePkg/Bus/Pci/EhciDxe: Fix FORWARD_NULL > Coverity issues > > From: Ranbir Singh <ranbir.sin...@dell.com> > > The function UsbHcGetPciAddressForHostMem has > > ASSERT ((Block != NULL)); > > and the UsbHcFreeMem has > > ASSERT (Block != NULL); > > statement after for loop, but these are applicable only in DEBUG mode. > In RELEASE mode, if for whatever reasons there is no match inside the > for loop and the loop exits because of Block != NULL; condition, then > there is no "Block" NULL pointer check afterwards and the code proceeds > to do dereferencing "Block" which will lead to CRASH. > > Hence, for safety add NULL pointer checks always. > > Cc: Hao A Wu <hao.a...@intel.com> > Cc: Ray Ni <ray...@intel.com> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4210 > Signed-off-by: Ranbir Singh <ranbir.sin...@dell.com> > Signed-off-by: Ranbir Singh <rsi...@ventanamicro.com> > --- > MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c > b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c > index 0a3ceb9f711a..79575b6f6304 100644 > --- a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c > +++ b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c > @@ -250,6 +250,11 @@ UsbHcGetPciAddressForHostMem ( > } > > > > ASSERT ((Block != NULL)); > > + > > + if (Block == NULL) { > > + return 0; > > + } > > + > > // > > // calculate the pci memory address for host memory address. > > // > > @@ -536,6 +541,10 @@ UsbHcFreeMem ( > // > > ASSERT (Block != NULL); > > > > + if (Block == NULL) { > > + return; > > + } > > + > > // > > // Release the current memory block if it is empty and not the head > > // > > -- > 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#106846): https://edk2.groups.io/g/devel/message/106846 Mute This Topic: https://groups.io/mt/99936708/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
