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

XHCI: Don't try to submit transfers to non-existent endpoints.

Browse Source 
Fixes #12929. The underlying issue that caused it still remains, though.
This commit is contained in:
Augustin Cavalier
2019-03-04 15:37:38 -05:00
parent 6b4d0adcd0
commit a40a4c0d39
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/xhci.cpp
+10 -2
View File
@@ -621,7 +621,7 @@ XHCI::SubmitControlRequest(Transfer *transfer)
xhci_endpoint *endpoint = (xhci_endpoint *)pipe->ControllerCookie(); xhci_endpoint *endpoint = (xhci_endpoint *)pipe->ControllerCookie();
uint8 id = XHCI_ENDPOINT_ID(pipe); uint8 id = XHCI_ENDPOINT_ID(pipe);
if (id >= XHCI_MAX_ENDPOINTS) { if (id >= XHCI_MAX_ENDPOINTS) {
TRACE_ERROR("Invalid Endpoint"); TRACE_ERROR("invalid endpoint!\n");
return B_BAD_VALUE; return B_BAD_VALUE;
} }
status_t status = transfer->InitKernelAccess(); status_t status = transfer->InitKernelAccess();
@@ -704,6 +704,7 @@ status_t
XHCI::SubmitNormalRequest(Transfer *transfer) XHCI::SubmitNormalRequest(Transfer *transfer)
{ {
TRACE("SubmitNormalRequest() length %ld\n", transfer->DataLength()); TRACE("SubmitNormalRequest() length %ld\n", transfer->DataLength());
Pipe *pipe = transfer->TransferPipe(); Pipe *pipe = transfer->TransferPipe();
uint8 id = XHCI_ENDPOINT_ID(pipe); uint8 id = XHCI_ENDPOINT_ID(pipe);
if (id >= XHCI_MAX_ENDPOINTS) if (id >= XHCI_MAX_ENDPOINTS)
@@ -1455,6 +1456,7 @@ XHCI::_InsertEndpointForPipe(Pipe *pipe)
{ {
TRACE("_InsertEndpointForPipe endpoint address %" B_PRId8 "\n", TRACE("_InsertEndpointForPipe endpoint address %" B_PRId8 "\n",
pipe->EndpointAddress()); pipe->EndpointAddress());
if (pipe->ControllerCookie() != NULL if (pipe->ControllerCookie() != NULL
|| pipe->Parent()->Type() != USB_OBJECT_DEVICE) { || pipe->Parent()->Type() != USB_OBJECT_DEVICE) {
// default pipe is already referenced // default pipe is already referenced
@@ -1573,6 +1575,12 @@ status_t
XHCI::_LinkDescriptorForPipe(xhci_td *descriptor, xhci_endpoint *endpoint) XHCI::_LinkDescriptorForPipe(xhci_td *descriptor, xhci_endpoint *endpoint)
{ {
TRACE("_LinkDescriptorForPipe\n"); TRACE("_LinkDescriptorForPipe\n");
if (endpoint->device == NULL) {
TRACE_ERROR("trying to submit a transfer to a non-existent endpoint!\n");
return B_NO_INIT;
}
MutexLocker endpointLocker(endpoint->lock); MutexLocker endpointLocker(endpoint->lock);
if (endpoint->used >= XHCI_MAX_TRANSFERS) { if (endpoint->used >= XHCI_MAX_TRANSFERS) {
TRACE_ERROR("_LinkDescriptorForPipe max transfers count exceeded\n"); TRACE_ERROR("_LinkDescriptorForPipe max transfers count exceeded\n");
@@ -2133,7 +2141,7 @@ XHCI::HandleTransferComplete(xhci_trb* trb)
return; return;
} }
} }
TRACE_ERROR("TRB %" B_PRIxADDR " was not found in the endpoint!\n", source); TRACE_ERROR("TRB 0x%" B_PRIxADDR " was not found in the endpoint!\n", source);
} }