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

XHCI: Check return status of PrepareKernelAccess.

Browse Source 
Potentially fixes #15172.
This commit is contained in:
Augustin Cavalier
2019-07-19 21:07:29 -04:00
parent a04ff4c767
commit 2f044f2aa7
1 changed files with 12 additions and 4 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
@@ -848,7 +848,11 @@ XHCI::SubmitNormalRequest(Transfer *transfer)
if (!directionIn) { if (!directionIn) {
TRACE("copying out iov count %ld\n", transfer->VectorCount()); TRACE("copying out iov count %ld\n", transfer->VectorCount());
transfer->PrepareKernelAccess(); status_t status = transfer->PrepareKernelAccess();
if (status != B_OK) {
FreeDescriptor(td);
return status;
}
WriteDescriptor(td, transfer->Vector(), transfer->VectorCount()); WriteDescriptor(td, transfer->Vector(), transfer->VectorCount());
} }
@@ -2801,9 +2805,13 @@ XHCI::FinishTransfers()
if (callbackStatus == B_OK) { if (callbackStatus == B_OK) {
if (directionIn && actualLength > 0) { if (directionIn && actualLength > 0) {
TRACE("copying in iov count %ld\n", transfer->VectorCount()); TRACE("copying in iov count %ld\n", transfer->VectorCount());
transfer->PrepareKernelAccess(); status_t status = transfer->PrepareKernelAccess();
if (status == B_OK) {
ReadDescriptor(td, transfer->Vector(), ReadDescriptor(td, transfer->Vector(),
transfer->VectorCount()); transfer->VectorCount());
} else {
callbackStatus = status;
}
} }
} }
transfer->Finished(callbackStatus, actualLength); transfer->Finished(callbackStatus, actualLength);