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

XHCI: Check the device object initialized successfully before adding it.

Browse Source 
Fixes various NULL dereferences in other parts of the USB stack
when the XHCI controller is not behaving quite as expected.

Possibly related to #13403.
This commit is contained in:
Augustin Cavalier
2019-02-22 01:23:08 -05:00
parent c7f186b23f
commit a54fc27a11
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/xhci.cpp
+6 -2
View File
@@ -1395,8 +1395,12 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
deviceObject = new(std::nothrow) Device(parent, hubAddress, hubPort, deviceObject = new(std::nothrow) Device(parent, hubAddress, hubPort,
deviceDescriptor, device->address + 1, speed, false, device); deviceDescriptor, device->address + 1, speed, false, device);
} }
if (deviceObject == NULL) { if (deviceObject == NULL || deviceObject->InitCheck() != B_OK) {
TRACE_ERROR("no memory to allocate device\n"); if (deviceObject == NULL) {
TRACE_ERROR("no memory to allocate device\n");
} else {
TRACE_ERROR("device object failed to initialize\n");
}
device->state = XHCI_STATE_DISABLED; device->state = XHCI_STATE_DISABLED;
delete_area(device->input_ctx_area); delete_area(device->input_ctx_area);
delete_area(device->device_ctx_area); delete_area(device->device_ctx_area);