diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel/syscalls.c | 16 | ||||
| -rw-r--r-- | src/kernel/vfs/backend.c | 6 | ||||
| -rw-r--r-- | src/shared/vfs.h | 2 |
3 files changed, 17 insertions, 7 deletions
diff --git a/src/kernel/syscalls.c b/src/kernel/syscalls.c index 124333a..48cb709 100644 --- a/src/kernel/syscalls.c +++ b/src/kernel/syscalls.c @@ -69,7 +69,7 @@ int _syscall_fork(void) { handle_t _syscall_open(const user_ptr path, int len) { struct vfs_mount *mount; - static char path_buf[PATH_MAX]; + char *path_buf = NULL; if (len > PATH_MAX) return -1; @@ -81,15 +81,17 @@ 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 + // note 2: path_buf gets freed in vfs_backend_finish + path_buf = kmalloc(len); if (!virt_cpy(NULL, (uintptr_t)path_buf, process_current->pages, path, len)) - return -1; + goto fail; len = path_simplify(path_buf, path_buf, len); - if (len < 0) return -1; + if (len < 0) goto fail; mount = vfs_mount_resolve(process_current->mount, path_buf, len); - if (!mount) return -1; + if (!mount) goto fail; vfs_backend_dispatch(mount->backend, (struct vfs_op) { .type = VFSOP_OPEN, @@ -98,7 +100,11 @@ handle_t _syscall_open(const user_ptr path, int len) { .path_len = len - mount->prefix_len, } }); - // doesn't return + // doesn't return / fallthrough to fail + +fail: + kfree(path_buf); + return -1; } int _syscall_mount(handle_t handle, const user_ptr path, int len) { diff --git a/src/kernel/vfs/backend.c b/src/kernel/vfs/backend.c index 0f684a0..58819fd 100644 --- a/src/kernel/vfs/backend.c +++ b/src/kernel/vfs/backend.c @@ -1,3 +1,4 @@ +#include <kernel/mem/alloc.h> #include <kernel/panic.h> #include <kernel/proc.h> #include <kernel/vfs/backend.h> @@ -49,7 +50,10 @@ _Noreturn void vfs_backend_finish(struct vfs_op_request *req, int ret) { }, }; ret = handle; - } + } + + if (req->op.type == VFSOP_OPEN) + kfree(req->op.open.path); req->caller->state = PS_RUNNING; regs_savereturn(&req->caller->regs, ret); diff --git a/src/shared/vfs.h b/src/shared/vfs.h index 730a288..9419b11 100644 --- a/src/shared/vfs.h +++ b/src/shared/vfs.h @@ -16,7 +16,7 @@ struct vfs_op { enum vfs_op_types type; union { struct { - const char *path; + char *path; int path_len; } open; struct { |