Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBSTOR] Don't assert on clean up if initization didnt finish (#7412)

Browse source 
During investigation into some of the USB stack issues we've been running into I've found that when a USB storage device is already plugged in during boot and removed before it finishes initialization we run into this assert.

The logic in this function removes the pools made for the following entries in DeviceExtension indiscriminately this makes debugging a bit more difficult. Instead of depending on this behavior of ALWAYS being filled with valid data, let's free the following pools ONLY if they're initialized. This change prevents us from bugchecking when USB flash drives are removed early during boot. This makes the debugging experience a little more sane.
This commit is contained in:
Justin Miller 2024-10-02 14:21:50 -07:00 committed by GitHub
parent 3dfbe52699
commit a65b6ae946
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/usb/usbstor/fdo.c
View file

@ -118,22 +118,16 @@ USBSTOR_FdoHandleRemoveDevice(
} }
// Freeing everything in DeviceExtension // Freeing everything in DeviceExtension
ASSERT( if (DeviceExtension->DeviceDescriptor)
DeviceExtension->DeviceDescriptor && ExFreePoolWithTag(DeviceExtension->DeviceDescriptor, USB_STOR_TAG);
DeviceExtension->ConfigurationDescriptor && if (DeviceExtension->ConfigurationDescriptor)
DeviceExtension->InterfaceInformation && ExFreePoolWithTag(DeviceExtension->ConfigurationDescriptor, USB_STOR_TAG);
DeviceExtension->ResetDeviceWorkItem if (DeviceExtension->InterfaceInformation)
); ExFreePoolWithTag(DeviceExtension->InterfaceInformation, USB_STOR_TAG);
if (DeviceExtension->ResetDeviceWorkItem)
ExFreePoolWithTag(DeviceExtension->DeviceDescriptor, USB_STOR_TAG); IoFreeWorkItem(DeviceExtension->ResetDeviceWorkItem);
ExFreePoolWithTag(DeviceExtension->ConfigurationDescriptor, USB_STOR_TAG);
ExFreePoolWithTag(DeviceExtension->InterfaceInformation, USB_STOR_TAG);
IoFreeWorkItem(DeviceExtension->ResetDeviceWorkItem);
if (DeviceExtension->SerialNumber) if (DeviceExtension->SerialNumber)
{
ExFreePoolWithTag(DeviceExtension->SerialNumber, USB_STOR_TAG); ExFreePoolWithTag(DeviceExtension->SerialNumber, USB_STOR_TAG);
}
// Send the IRP down the stack // Send the IRP down the stack
IoSkipCurrentIrpStackLocation(Irp); IoSkipCurrentIrpStackLocation(Irp);