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

device_manager: IORequest: use user_memcpy() to access a user buffer.

Browse Source 
* should fix #14164, but the case can't be reproduced easily it seems.

Change-Id: I636db93cc1efe2784b2530dced6a900fbfe3dce8
This commit is contained in:
Jérôme Duval
2018-05-31 11:55:18 +00:00
parent 92875838d6
commit 499712a9ec
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/device_manager/IORequest.cpp
+10
View File
@@ -1281,6 +1281,16 @@ IORequest::_CopySimple(void* bounceBuffer, generic_addr_t external, size_t size,
{ {
TRACE(" IORequest::_CopySimple(%p, %#" B_PRIxGENADDR ", %lu, %d)\n", TRACE(" IORequest::_CopySimple(%p, %#" B_PRIxGENADDR ", %lu, %d)\n",
bounceBuffer, external, size, copyIn); bounceBuffer, external, size, copyIn);
if (IS_USER_ADDRESS(external)) {
status_t status = B_OK;
if (copyIn)
status = user_memcpy(bounceBuffer, (void*)(addr_t)external, size);
else
status = user_memcpy((void*)(addr_t)external, bounceBuffer, size);
if (status < B_OK)
return status;
return B_OK;
}
if (copyIn) if (copyIn)
memcpy(bounceBuffer, (void*)(addr_t)external, size); memcpy(bounceBuffer, (void*)(addr_t)external, size);
else else