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

XHCI: Check earlier on that the endpoint is actually valid.

Browse Source 
This may catch the "division by zero" KDLs earlier.
Related to #14943, #16794, and #16878.
This commit is contained in:
Augustin Cavalier
2021-09-09 18:02:37 -04:00
parent 0945c7e4e6
commit 17f42bc1d9
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/xhci.cpp
+13 -9
View File
@@ -715,9 +715,14 @@ XHCI::SubmitControlRequest(Transfer *transfer)
xhci_endpoint *endpoint = (xhci_endpoint *)pipe->ControllerCookie(); xhci_endpoint *endpoint = (xhci_endpoint *)pipe->ControllerCookie();
if (endpoint == NULL) { if (endpoint == NULL) {
TRACE_ERROR("invalid endpoint!\n"); TRACE_ERROR("control pipe has no endpoint!\n");
return B_BAD_VALUE; return B_BAD_VALUE;
} }
if (endpoint->device == NULL) {
panic("endpoint is not initialized!");
return B_NO_INIT;
}
status_t status = transfer->InitKernelAccess(); status_t status = transfer->InitKernelAccess();
if (status != B_OK) if (status != B_OK)
return status; return status;
@@ -793,8 +798,14 @@ XHCI::SubmitNormalRequest(Transfer *transfer)
bool directionIn = (pipe->Direction() == Pipe::In); bool directionIn = (pipe->Direction() == Pipe::In);
xhci_endpoint *endpoint = (xhci_endpoint *)pipe->ControllerCookie(); xhci_endpoint *endpoint = (xhci_endpoint *)pipe->ControllerCookie();
if (endpoint == NULL) if (endpoint == NULL) {
TRACE_ERROR("pipe has no endpoint!\n");
return B_BAD_VALUE; return B_BAD_VALUE;
}
if (endpoint->device == NULL) {
panic("endpoint is not initialized!");
return B_NO_INIT;
}
status_t status = transfer->InitKernelAccess(); status_t status = transfer->InitKernelAccess();
if (status != B_OK) if (status != B_OK)
@@ -1824,13 +1835,6 @@ XHCI::_LinkDescriptorForPipe(xhci_td *descriptor, xhci_endpoint *endpoint)
{ {
TRACE("link descriptor for pipe\n"); TRACE("link descriptor for pipe\n");
// We must check this before we lock the endpoint, because if it is
// NULL, the mutex is probably uninitialized, too.
if (endpoint->device == NULL) {
TRACE_ERROR("trying to submit a transfer to a non-existent endpoint!\n");
return B_NO_INIT;
}
// Use mutex_trylock first, in case we are in KDL. // Use mutex_trylock first, in case we are in KDL.
if (mutex_trylock(&endpoint->lock) != B_OK) if (mutex_trylock(&endpoint->lock) != B_OK)
mutex_lock(&endpoint->lock); mutex_lock(&endpoint->lock);