diff options
-rw-r--r-- | src/kernel/mem/virt.c | 2 | ||||
-rw-r--r-- | src/kernel/mem/virt.h | 2 | ||||
-rw-r--r-- | src/kernel/syscalls.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/kernel/mem/virt.c b/src/kernel/mem/virt.c index beeb54f..4789e53 100644 --- a/src/kernel/mem/virt.c +++ b/src/kernel/mem/virt.c @@ -50,7 +50,7 @@ bool virt_iter_next(struct virt_iter *iter) { return true; } -bool virt_user_cpy( +bool virt_cpy( struct pagedir *dest_pages, user_ptr dest, struct pagedir *src_pages, const user_ptr src, size_t length) { diff --git a/src/kernel/mem/virt.h b/src/kernel/mem/virt.h index e87a9fe..38410fb 100644 --- a/src/kernel/mem/virt.h +++ b/src/kernel/mem/virt.h @@ -24,6 +24,6 @@ void virt_iter_new( bool virt_iter_next(struct virt_iter *); -bool virt_user_cpy( +bool virt_cpy( struct pagedir *dest_pages, user_ptr dest, struct pagedir *src_pages, const user_ptr src, size_t length); diff --git a/src/kernel/syscalls.c b/src/kernel/syscalls.c index 2174791..88dceef 100644 --- a/src/kernel/syscalls.c +++ b/src/kernel/syscalls.c @@ -19,7 +19,7 @@ _Noreturn static void await_finish(struct process *dead, struct process *listene len = listener->saved_len < dead->saved_len ? listener->saved_len : dead->saved_len; - res = virt_user_cpy( + res = virt_cpy( listener->pages, listener->saved_addr, dead->pages, dead->saved_addr, len); regs_savereturn(&listener->regs, res ? len : -1); @@ -81,7 +81,7 @@ handle_t _syscall_open(const user_ptr path, int len) { // copy the path to the kernel // note: the cast is necessary because the function usually accepts user_ptrs // it can handle copies to physical memory too, though - if (!virt_user_cpy(NULL, (uintptr_t)path_buf, + if (!virt_cpy(NULL, (uintptr_t)path_buf, process_current->pages, path, len)) return -1; @@ -112,7 +112,7 @@ int _syscall_mount(handle_t handle, const user_ptr path, int len) { // copy the path to the kernel path_buf = kmalloc(len); - if (!virt_user_cpy(NULL, (uintptr_t)path_buf, + if (!virt_cpy(NULL, (uintptr_t)path_buf, process_current->pages, path, len)) goto fail; |