diff options
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/proc.h | 5 | ||||
| -rw-r--r-- | src/kernel/syscalls.c | 11 | ||||
| -rw-r--r-- | src/kernel/vfs/request.c | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/kernel/proc.h b/src/kernel/proc.h index 970c694..0e02d27 100644 --- a/src/kernel/proc.h +++ b/src/kernel/proc.h @@ -2,6 +2,7 @@ #include <kernel/arch/generic.h> #include <kernel/handle.h> #include <kernel/vfs/mount.h> +#include <shared/syscalls.h> enum process_state { PS_RUNNING, @@ -32,8 +33,8 @@ struct process { struct vfs_request pending_req; // PS_WAITS4FS struct { char __user *buf; - int __user *len; - int __user *id; + int max_len; + struct fs_wait_response __user *res; } awaited_req; // PS_WAITS4REQUEST }; struct vfs_request *handled_req; diff --git a/src/kernel/syscalls.c b/src/kernel/syscalls.c index 497aa7f..bc185bd 100644 --- a/src/kernel/syscalls.c +++ b/src/kernel/syscalls.c @@ -207,7 +207,8 @@ fail: return -1; } -int _syscall_fs_wait(handle_t back, char __user *buf, int __user *len, int __user *id) { +int _syscall_fs_wait(handle_t back, char __user *buf, int max_len, + struct fs_wait_response __user *res) { struct handle *back_handle; if (back < 0 || back >= HANDLE_MAX) return -1; @@ -219,9 +220,9 @@ int _syscall_fs_wait(handle_t back, char __user *buf, int __user *len, int __use back_handle->fs.backend->handler = process_current; /* checking the validity of those pointers here would make * vfs_request_pass2handler simpler. TODO? */ - process_current->awaited_req.buf = buf; - process_current->awaited_req.len = len; - process_current->awaited_req.id = id; + process_current->awaited_req.buf = buf; + process_current->awaited_req.max_len = max_len; + process_current->awaited_req.res = res; if (back_handle->fs.backend->queue) { // handle queued requests @@ -293,7 +294,7 @@ int _syscall(int num, int a, int b, int c, int d) { case _SYSCALL_FS_CREATE: return _syscall_fs_create((userptr_t)a); case _SYSCALL_FS_WAIT: - return _syscall_fs_wait(a, (userptr_t)b, (userptr_t)c, (userptr_t)d); + return _syscall_fs_wait(a, (userptr_t)b, c, (userptr_t)d); case _SYSCALL_FS_RESPOND: return _syscall_fs_respond((userptr_t)a, b); case _SYSCALL_MEMFLAG: diff --git a/src/kernel/vfs/request.c b/src/kernel/vfs/request.c index 2fd4689..dfeeb50 100644 --- a/src/kernel/vfs/request.c +++ b/src/kernel/vfs/request.c @@ -39,6 +39,7 @@ int vfs_request_create(struct vfs_request req_) { _Noreturn void vfs_request_pass2handler(struct vfs_request *req) { struct process *handler = req->backend->handler; + struct fs_wait_response res = {0}; int len; assert(handler); assert(handler->state == PS_WAITS4REQUEST); @@ -46,9 +47,7 @@ _Noreturn void vfs_request_pass2handler(struct vfs_request *req) { handler->state = PS_RUNNING; handler->handled_req = req; - if (!virt_cpy_from(handler->pages, - &len, handler->awaited_req.len, sizeof len)) - goto fail; // can't read buffer length + len = handler->awaited_req.max_len; if (len > req->input.len) { // input bigger than buffer // TODO what should be done during e.g. open() calls? truncating doesn't seem right @@ -65,13 +64,12 @@ _Noreturn void vfs_request_pass2handler(struct vfs_request *req) { goto fail; // can't copy buffer } - if (!virt_cpy_to(handler->pages, - handler->awaited_req.len, &len, sizeof len)) - goto fail; // can't copy new length + res.len = len; + res.id = req->id; if (!virt_cpy_to(handler->pages, - handler->awaited_req.id, &req->id, sizeof req->id)) - goto fail; // can't copy id + handler->awaited_req.res, &res, sizeof res)) + goto fail; // can't copy response struct regs_savereturn(&handler->regs, req->type); process_switch(handler); |