i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb_disk: Ensure we are in a consistent locking state before calling free.

Browse Source 
Should fix the KDL in #16745.
This commit is contained in:
Augustin Cavalier
2023-05-31 15:01:03 -04:00
parent cb1df90e30
commit 1eb7837ddd
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
+8 -2
View File
@@ -142,7 +142,8 @@ get_dma_resource(disk_device *device, uint32 blockSize)
void void
usb_disk_free_device_and_luns(disk_device *device) usb_disk_free_device_and_luns(disk_device *device)
{ {
mutex_lock(&device->lock); ASSERT_LOCKED_MUTEX(&device->lock);
for (int32 i = 0; i < device->dma_resources.Count(); i++) for (int32 i = 0; i < device->dma_resources.Count(); i++)
delete device->dma_resources[i]; delete device->dma_resources[i];
for (uint8 i = 0; i < device->lun_count; i++) for (uint8 i = 0; i < device->lun_count; i++)
@@ -1231,6 +1232,7 @@ usb_disk_device_removed(void *cookie)
{ {
TRACE("device_removed(0x%p)\n", cookie); TRACE("device_removed(0x%p)\n", cookie);
disk_device *device = (disk_device *)cookie; disk_device *device = (disk_device *)cookie;
mutex_lock(&device->lock);
for (uint8 i = 0; i < device->lun_count; i++) for (uint8 i = 0; i < device->lun_count; i++)
gDeviceManager->unpublish_device(device->node, device->luns[i]->name); gDeviceManager->unpublish_device(device->node, device->luns[i]->name);
@@ -1240,6 +1242,8 @@ usb_disk_device_removed(void *cookie)
gUSBModule->cancel_queued_transfers(device->bulk_out); gUSBModule->cancel_queued_transfers(device->bulk_out);
if (device->open_count == 0) if (device->open_count == 0)
usb_disk_free_device_and_luns(device); usb_disk_free_device_and_luns(device);
else
mutex_unlock(&device->lock);
} }
@@ -1476,13 +1480,15 @@ usb_disk_free(void *cookie)
device_lun *lun = (device_lun *)cookie; device_lun *lun = (device_lun *)cookie;
disk_device *device = lun->device; disk_device *device = lun->device;
MutexLocker locker(device->lock); mutex_lock(&device->lock);
device->open_count--; device->open_count--;
if (device->open_count == 0 && device->removed) { if (device->open_count == 0 && device->removed) {
// we can simply free the device here as it has been removed from // we can simply free the device here as it has been removed from
// the device list in the device removed notification hook // the device list in the device removed notification hook
usb_disk_free_device_and_luns(device); usb_disk_free_device_and_luns(device);
} else {
mutex_unlock(&device->lock);
} }
return B_OK; return B_OK;