On 11/7/23 16:52, Laszlo Ersek wrote: > On 11/7/23 06:38, Ranbir Singh wrote: >> From: Ranbir Singh <ranbir.sin...@dell.com> >> >> The function USBMouseDriverBindingStart do have >> >> ASSERT (UsbMouseDevice != NULL); >> >> after AllocateZeroPool, but it is applicable only in DEBUG mode. >> In RELEASE mode, if for whatever reasons UsbMouseDevice is NULL >> at this point, the code proceeds to dereference "UsbMouseDevice" >> afterwards which will lead to CRASH. >> >> Hence, for safety add NULL pointer checks always. >> >> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4222 >> >> Cc: Ray Ni <ray...@intel.com> >> Co-authored-by: Veeresh Sangolli <veeresh.sango...@dellteam.com> >> Signed-off-by: Ranbir Singh <ranbir.sin...@dell.com> >> Signed-off-by: Ranbir Singh <rsi...@ventanamicro.com> >> Reviewed-by: Laszlo Ersek <ler...@redhat.com> >> --- >> MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c >> b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c >> index 451d4b934f4c..67072d476196 100644 >> --- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c >> +++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c >> @@ -160,7 +160,10 @@ USBMouseDriverBindingStart ( >> } >> >> UsbMouseDevice = AllocateZeroPool (sizeof (USB_MOUSE_DEV)); >> - ASSERT (UsbMouseDevice != NULL); >> + if (UsbMouseDevice == NULL) { >> + Status = EFI_OUT_OF_RESOURCES; >> + goto ErrorExit; >> + } >> >> UsbMouseDevice->UsbIo = UsbIo; >> UsbMouseDevice->Signature = USB_MOUSE_DEV_SIGNATURE; > > Reviewed-by: Laszlo Ersek <ler...@redhat.com> >
sorry I missed that I gave R-b for this previously, and that you had picked it up already! -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#110859): https://edk2.groups.io/g/devel/message/110859 Mute This Topic: https://groups.io/mt/102437986/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
