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

No longer uses strncpy(). Removed the user_strncpy() call - we don't want

Browse Source 
to have it in the kernel.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6694 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-02-23 04:40:02 +00:00
parent 0d6f9a67e5
commit 083d73d739
1 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/vm/vm.c
+21 -36
View File
@@ -815,41 +815,23 @@ region_id vm_map_file(aspace_id aid, char *name, void **address, int addr_type,
region_id user_vm_map_file(char *uname, void **uaddress, int addr_type, region_id user_vm_map_file(char *uname, void **uaddress, int addr_type,
addr size, int lock, int mapping, const char *upath, off_t offset) addr size, int lock, int mapping, const char *upath, off_t offset)
{ {
char name[SYS_MAX_OS_NAME_LEN]; char name[B_OS_NAME_LENGTH];
void *address; void *address;
char path[SYS_MAX_PATH_LEN]; char path[SYS_MAX_PATH_LEN];
int rc, rc2; int rc;
if((addr)uname >= KERNEL_BASE && (addr)uname <= KERNEL_TOP) if (!IS_USER_ADDRESS(uname) || !IS_USER_ADDRESS(uaddress) || !IS_USER_ADDRESS(upath)
return ERR_VM_BAD_USER_MEMORY; || user_strlcpy(name, uname, B_OS_NAME_LENGTH) < B_OK
|| user_strlcpy(path, upath, SYS_MAX_PATH_LEN) < B_OK
if((addr)uaddress >= KERNEL_BASE && (addr)uaddress <= KERNEL_TOP) || user_memcpy(&address, uaddress, sizeof(address)) < B_OK)
return ERR_VM_BAD_USER_MEMORY; return B_BAD_ADDRESS;
if((addr)upath >= KERNEL_BASE && (addr)upath <= KERNEL_TOP)
return ERR_VM_BAD_USER_MEMORY;
rc = user_strncpy(name, uname, SYS_MAX_OS_NAME_LEN-1);
if(rc < 0)
return rc;
name[SYS_MAX_OS_NAME_LEN-1] = 0;
rc = user_strncpy(path, upath, SYS_MAX_PATH_LEN-1);
if(rc < 0)
return rc;
path[SYS_MAX_PATH_LEN-1] = 0;
rc = user_memcpy(&address, uaddress, sizeof(address));
if(rc < 0)
return rc;
rc = _vm_map_file(vm_get_current_user_aspace_id(), name, &address, addr_type, size, lock, mapping, path, offset, false); rc = _vm_map_file(vm_get_current_user_aspace_id(), name, &address, addr_type, size, lock, mapping, path, offset, false);
if(rc < 0) if (rc < 0)
return rc; return rc;
rc2 = user_memcpy(uaddress, &address, sizeof(address)); if (user_memcpy(uaddress, &address, sizeof(address)) < B_OK)
if(rc2 < 0) return B_BAD_ADDRESS;
return rc2;
return rc; return rc;
} }
@@ -2161,21 +2143,23 @@ void vm_increase_max_commit(addr delta)
restore_interrupts(state); restore_interrupts(state);
} }
int user_memcpy(void *to, const void *from, size_t size)
// #pragma mark -
int
user_memcpy(void *to, const void *from, size_t size)
{ {
return arch_cpu_user_memcpy(to, from, size, &thread_get_current_thread()->fault_handler); return arch_cpu_user_memcpy(to, from, size, &thread_get_current_thread()->fault_handler);
} }
int user_strcpy(char *to, const char *from)
int
user_strcpy(char *to, const char *from)
{ {
return arch_cpu_user_strcpy(to, from, &thread_get_current_thread()->fault_handler); return arch_cpu_user_strcpy(to, from, &thread_get_current_thread()->fault_handler);
} }
int user_strncpy(char *to, const char *from, size_t size)
{
return arch_cpu_user_strncpy(to, from, size, &thread_get_current_thread()->fault_handler);
}
int int
user_strlcpy(char *to, const char *from, size_t size) user_strlcpy(char *to, const char *from, size_t size)
@@ -2184,7 +2168,8 @@ user_strlcpy(char *to, const char *from, size_t size)
} }
int user_memset(void *s, char c, size_t count) int
user_memset(void *s, char c, size_t count)
{ {
return arch_cpu_user_memset(s, c, count, &thread_get_current_thread()->fault_handler); return arch_cpu_user_memset(s, c, count, &thread_get_current_thread()->fault_handler);
} }