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

<driver>mem: use user_memcpy instead of memcpy.

Browse Source 
Change-Id: Id37e0e48a936de2e9fcfc5b9e16aad22b6dd0901
Reviewed-on: https://review.haiku-os.org/c/1414
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Jérôme Duval
2019-04-26 15:48:40 +00:00
parent 785877e9c0
commit 471e44c962
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/misc/mem.c
+16 -5
View File
@@ -1,13 +1,17 @@
/* /*
* Copyright 2007, Haiku, Inc. All rights reserved. * Copyright 2007-2019, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#include <Drivers.h> #include <Drivers.h>
#include <KernelExport.h> #include <KernelExport.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#define DRIVER_NAME "mem" #define DRIVER_NAME "mem"
#define DEVICE_NAME "misc/mem" #define DEVICE_NAME "misc/mem"
@@ -45,6 +49,7 @@ device_hooks mem_hooks = {
int32 api_version = B_CUR_DRIVER_API_VERSION; int32 api_version = B_CUR_DRIVER_API_VERSION;
status_t status_t
init_hardware(void) init_hardware(void)
{ {
@@ -107,6 +112,7 @@ mem_read(void* cookie, off_t position, void* buffer, size_t* numBytes)
{ {
void *virtualAddress; void *virtualAddress;
area_id area; area_id area;
status_t status = B_OK;
/* check permissions */ /* check permissions */
if (getuid() != 0 && geteuid() != 0) { if (getuid() != 0 && geteuid() != 0) {
@@ -120,9 +126,11 @@ mem_read(void* cookie, off_t position, void* buffer, size_t* numBytes)
return area; return area;
} }
memcpy(buffer, virtualAddress, *numBytes); if (user_memcpy(buffer, virtualAddress, *numBytes) != B_OK)
status = B_BAD_ADDRESS;
delete_area(area); delete_area(area);
return B_OK; return status;
} }
@@ -131,6 +139,7 @@ mem_write(void* cookie, off_t position, const void* buffer, size_t* numBytes)
{ {
void *virtualAddress; void *virtualAddress;
area_id area; area_id area;
status_t status = B_OK;
/* check permissions */ /* check permissions */
if (getuid() != 0 && geteuid() != 0) { if (getuid() != 0 && geteuid() != 0) {
@@ -144,9 +153,11 @@ mem_write(void* cookie, off_t position, const void* buffer, size_t* numBytes)
return area; return area;
} }
memcpy(virtualAddress, buffer, *numBytes); if (user_memcpy(virtualAddress, buffer, *numBytes) != B_OK)
status = B_BAD_ADDRESS;
delete_area(area); delete_area(area);
return B_OK; return status;
} }