diff options
| -rw-r--r-- | apps/init.c | 10 | ||||
| -rw-r--r-- | apps/wm.c | 3 | ||||
| -rw-r--r-- | kernel/drivers/fb.c | 2 | ||||
| -rw-r--r-- | kernel/drivers/keyboard.c | 7 | ||||
| -rw-r--r-- | kernel/drivers/mouse.c | 5 | ||||
| -rw-r--r-- | kernel/features/fs.c | 189 | ||||
| -rw-r--r-- | kernel/features/load.c | 21 | ||||
| -rw-r--r-- | kernel/features/mm.c | 28 | ||||
| -rw-r--r-- | kernel/features/proc.c | 37 | ||||
| -rw-r--r-- | kernel/features/syscall.c | 31 | ||||
| -rw-r--r-- | kernel/inc/fb.h | 4 | ||||
| -rw-r--r-- | kernel/inc/fs.h | 12 | ||||
| -rw-r--r-- | kernel/inc/load.h | 3 | ||||
| -rw-r--r-- | kernel/inc/mm.h | 6 | ||||
| -rw-r--r-- | libc/Makefile | 3 | ||||
| -rw-r--r-- | libc/errno.c | 14 | ||||
| -rw-r--r-- | libc/inc/errno.h | 49 | ||||
| -rw-r--r-- | libc/inc/str.h | 2 | ||||
| -rw-r--r-- | libc/print.c | 5 | ||||
| -rw-r--r-- | libc/random.c | 10 | ||||
| -rw-r--r-- | libc/str.c | 46 | ||||
| -rw-r--r-- | libc/sys.c | 20 |
22 files changed, 360 insertions, 147 deletions
diff --git a/apps/init.c b/apps/init.c index c59e3bf..5a233c1 100644 --- a/apps/init.c +++ b/apps/init.c @@ -1,9 +1,7 @@ // MIT License, Copyright (c) 2020 Marvin Borner +#include <assert.h> #include <def.h> -#include <net.h> -#include <print.h> -#include <str.h> #include <sys.h> #include <cpu.h> @@ -13,8 +11,8 @@ int main(int argc, char **argv) UNUSED(argc); UNUSED(argv); - int wm = exec("/bin/wm", "wm", NULL); - int test = exec("/bin/window", "test", NULL); + assert(exec("/bin/wm", "wm", NULL) == 0); + /* assert(exec("/bin/window", "test", NULL) == 0); */ - return wm + test; + return 0; } @@ -2,6 +2,7 @@ #include <assert.h> #include <def.h> +#include <errno.h> #include <gfx.h> #include <gui.h> #include <input.h> @@ -404,7 +405,7 @@ int main(int argc, char **argv) } } } - panic("Poll/read error!\n"); + panic("Poll/read error: %s\n", strerror(errno)); } // TODO: Execute? diff --git a/kernel/drivers/fb.c b/kernel/drivers/fb.c index 8e73f5b..af8a830 100644 --- a/kernel/drivers/fb.c +++ b/kernel/drivers/fb.c @@ -45,7 +45,7 @@ static s32 fb_ioctl(u32 request, void *arg1, void *arg2, void *arg3, struct devi } } -static u8 fb_ready(void) +static s32 fb_ready(void) { return 1; } diff --git a/kernel/drivers/keyboard.c b/kernel/drivers/keyboard.c index dbee8e1..79cd579 100644 --- a/kernel/drivers/keyboard.c +++ b/kernel/drivers/keyboard.c @@ -2,6 +2,7 @@ #include <cpu.h> #include <def.h> +#include <errno.h> #include <fs.h> #include <interrupts.h> #include <keyboard.h> @@ -62,9 +63,9 @@ static void keyboard_rate(void) static s32 keyboard_read(void *buf, u32 offset, u32 count, struct device *dev) { - (void)dev; + UNUSED(dev); if (stack_empty(queue)) - return -1; + return -EINVAL; struct event_keyboard *e = stack_pop(queue); memcpy(buf, (u8 *)e + offset, MIN(count, sizeof(*e))); @@ -72,7 +73,7 @@ static s32 keyboard_read(void *buf, u32 offset, u32 count, struct device *dev) return MIN(count, sizeof(*e)); } -static u8 keyboard_ready(void) +static s32 keyboard_ready(void) { return !stack_empty(queue); } diff --git a/kernel/drivers/mouse.c b/kernel/drivers/mouse.c index 5c481da..8545099 100644 --- a/kernel/drivers/mouse.c +++ b/kernel/drivers/mouse.c @@ -2,6 +2,7 @@ #include <boot.h> #include <cpu.h> +#include <errno.h> #include <fs.h> #include <interrupts.h> #include <mem.h> @@ -83,7 +84,7 @@ static u8 mouse_serial_read(void) return inb(0x60); } -static u8 mouse_ready(void) +static s32 mouse_ready(void) { return !stack_empty(queue); } @@ -92,7 +93,7 @@ static s32 mouse_read(void *buf, u32 offset, u32 count, struct device *dev) { (void)dev; if (stack_empty(queue)) - return -1; + return -EINVAL; struct event_mouse *e = stack_pop(queue); memcpy(buf, (u8 *)e + offset, MIN(count, sizeof(*e))); diff --git a/kernel/features/fs.c b/kernel/features/fs.c index c692aac..56d253a 100644 --- a/kernel/features/fs.c +++ b/kernel/features/fs.c @@ -2,6 +2,7 @@ #include <assert.h> #include <def.h> +#include <errno.h> #include <fs.h> #include <ide.h> #include <mem.h> @@ -107,9 +108,14 @@ static void vfs_list_mounts() s32 vfs_mount(struct device *dev, const char *path) { - // TODO: Check if already mounted - if (!dev || !dev->id || vfs_mounted(dev, path)) - return -1; + if (!path || !memory_valid(path)) + return -EFAULT; + + if (!dev || !memory_valid(dev) || !dev->id) + return -EFAULT; + + if (vfs_mounted(dev, path)) + return -EBUSY; char *fixed = vfs_normalize_path(path); @@ -124,25 +130,31 @@ s32 vfs_mount(struct device *dev, const char *path) s32 vfs_read(const char *path, void *buf, u32 offset, u32 count) { /* printf("%s READ: %s\n", proc_current() ? proc_current()->name : "Unknown", path); */ - if (!count) - return 0; + if (!path || !memory_valid(path)) + return -EFAULT; - if (offset > count || !buf) - return -1; + if (!buf || !memory_valid(buf)) + return -EFAULT; - while (*path == ' ') - path++; + if (offset > count) + return -EINVAL; struct mount_info *m = vfs_find_mount_info(path); - if (!(m && m->dev && m->dev->vfs && m->dev->vfs->read && m->dev->vfs->perm)) - return -1; + if (!m || !m->dev || !m->dev->vfs) + return -ENOENT; + + if (!m->dev->vfs->read || !m->dev->vfs->perm) + return -EINVAL; u32 len = strlen(m->path); if (len > 1) path += len; if (!m->dev->vfs->perm(path, VFS_READ, m->dev) && !proc_super()) - return -1; + return -EACCES; + + if (!count) + return 0; return m->dev->vfs->read(path, buf, offset, count, m->dev); } @@ -150,83 +162,95 @@ s32 vfs_read(const char *path, void *buf, u32 offset, u32 count) s32 vfs_write(const char *path, void *buf, u32 offset, u32 count) { /* printf("%s WRITE: %s\n", proc_current() ? proc_current()->name : "Unknown", path); */ - if (!count) - return 0; + if (!path || !memory_valid(path)) + return -EFAULT; - if (offset > count || !buf) - return -1; + if (!buf || !memory_valid(buf)) + return -EFAULT; - while (*path == ' ') - path++; + if (offset > count) + return -EINVAL; struct mount_info *m = vfs_find_mount_info(path); - if (!(m && m->dev && m->dev->vfs && m->dev->vfs->write && m->dev->vfs->perm)) - return -1; + if (!m || !m->dev || !m->dev->vfs) + return -ENOENT; + + if (!m->dev->vfs->write || !m->dev->vfs->perm) + return -EINVAL; u32 len = strlen(m->path); if (len > 1) path += len; if (!m->dev->vfs->perm(path, VFS_WRITE, m->dev) && !proc_super()) - return -1; + return -EACCES; + + if (!count) + return 0; return m->dev->vfs->write(path, buf, offset, count, m->dev); } s32 vfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3) { - while (*path == ' ') - path++; + if (!path || !memory_valid(path)) + return -EFAULT; struct mount_info *m = vfs_find_mount_info(path); - if (!(m && m->dev && m->dev->vfs && m->dev->vfs->ioctl && m->dev->vfs->perm)) - return -1; + if (!m || !m->dev || !m->dev->vfs) + return -ENOENT; + + if (!m->dev->vfs->ioctl || !m->dev->vfs->perm) + return -EINVAL; u32 len = strlen(m->path); if (len > 1) path += len; if (!m->dev->vfs->perm(path, VFS_WRITE, m->dev) && !proc_super()) - return -1; + return -EACCES; return m->dev->vfs->ioctl(path, request, arg1, arg2, arg3, m->dev); } s32 vfs_stat(const char *path, struct stat *buf) { - while (*path == ' ') - path++; + if (!path || !memory_valid(path)) + return -EFAULT; - if (!buf) - return -1; + if (!buf || !memory_valid(buf)) + return -EFAULT; struct mount_info *m = vfs_find_mount_info(path); - if (!(m && m->dev && m->dev->vfs && m->dev->vfs->stat && m->dev->vfs->perm)) - return -1; + if (!m || !m->dev || !m->dev->vfs) + return -ENOENT; + + if (!m->dev->vfs->stat || !m->dev->vfs->perm) + return -EINVAL; u32 len = strlen(m->path); if (len > 1) path += len; - if (!m->dev->vfs->perm(path, VFS_WRITE, m->dev) && !proc_super()) - return -1; + if (!m->dev->vfs->perm(path, VFS_READ, m->dev) && !proc_super()) + return -EACCES; return m->dev->vfs->stat(path, buf, m->dev); } s32 vfs_wait(const char *path, u32 func_ptr) { - while (*path == ' ') - path++; + if (!path || !func_ptr || !memory_valid(path)) + return -EFAULT; struct mount_info *m = vfs_find_mount_info(path); - if (!(m && m->dev && m->dev->vfs)) - return -1; + if (!m || !m->dev || !m->dev->vfs) + return -ENOENT; // Default wait if (!m->dev->vfs->wait) { proc_wait_for(vfs_find_dev(path)->id, PROC_WAIT_DEV, func_ptr); - return 1; + return 0; } u32 len = strlen(m->path); @@ -238,26 +262,34 @@ s32 vfs_wait(const char *path, u32 func_ptr) s32 vfs_poll(const char **files) { - if (!files) - return -1; + if (!files || !memory_valid(files)) + return -EFAULT; - for (const char **p = files; memory_user_valid((u32)*p) && *p && **p; p++) - if (vfs_ready(*p)) + for (const char **p = files; *p && memory_valid(*p) && **p; p++) { + s32 ready = vfs_ready(*p); + if (ready == 1) return p - files; + else if (ready < 0) + return ready; + } - for (const char **p = files; memory_user_valid((u32)*p) && *p && **p; p++) + for (const char **p = files; *p && memory_valid(*p) && **p; p++) vfs_wait(*p, (u32)vfs_poll); return PROC_MAX_WAIT_IDS + 1; } -u8 vfs_ready(const char *path) +s32 vfs_ready(const char *path) { - while (*path == ' ') - path++; + if (!path || !memory_valid(path)) + return -EFAULT; struct mount_info *m = vfs_find_mount_info(path); - assert(m && m->dev && m->dev->vfs && m->dev->vfs->ready); + if (!m || !m->dev || !m->dev->vfs) + return -ENOENT; + + if (!m->dev->vfs->ready) + return -EINVAL; u32 len = strlen(m->path); if (len > 1) @@ -308,8 +340,10 @@ struct device *device_get_by_name(const char *name) static s32 devfs_read(const char *path, void *buf, u32 offset, u32 count, struct device *dev) { struct device *target = device_get_by_name(path + 1); - if (!target || !target->read) - return -1; + if (!target) + return -ENOENT; + if (!target->read) + return -EINVAL; return target->read(buf, offset, count, dev); } @@ -317,26 +351,30 @@ static s32 devfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, vo struct device *dev) { struct device *target = device_get_by_name(path + 1); - if (!target || !target->ioctl) - return -1; + if (!target) + return -ENOENT; + if (!target->ioctl) + return -EINVAL; return target->ioctl(request, arg1, arg2, arg3, dev); } -static u8 devfs_perm(const char *path, enum vfs_perm perm, struct device *dev) +static s32 devfs_perm(const char *path, enum vfs_perm perm, struct device *dev) { - (void)path; - (void)perm; - (void)dev; + UNUSED(path); + UNUSED(perm); + UNUSED(dev); return 1; } -static u8 devfs_ready(const char *path, struct device *dev) +static s32 devfs_ready(const char *path, struct device *dev) { - (void)dev; + UNUSED(dev); struct device *target = device_get_by_name(path + 1); - if (!target || !target->ready) - return 0; + if (!target) + return -ENOENT; + if (!target->ready) + return -EINVAL; return target->ready(); } @@ -367,7 +405,7 @@ void device_install(void) // TODO: Remove malloc from buffer_read (attempt in #56cd63f199) static void *buffer_read(u32 block, struct device *dev) { - void *buf = malloc(BLOCK_SIZE); + void *buf = zalloc(BLOCK_SIZE); dev->read(buf, block * SECTOR_COUNT, SECTOR_COUNT, dev); return buf; } @@ -448,15 +486,15 @@ static u32 read_indirect(u32 indirect, u32 block_num, struct device *dev) static s32 read_inode(struct ext2_inode *in, void *buf, u32 offset, u32 count, struct device *dev) { // TODO: Support read offset - (void)offset; + UNUSED(offset); if (!in || !buf) - return -1; + return -EINVAL; u32 num_blocks = in->blocks / (BLOCK_SIZE / SECTOR_SIZE); if (!num_blocks) - return -1; + return -EINVAL; // TODO: memcpy block chunks until count is copied while (BLOCK_SIZE * num_blocks > count) @@ -538,7 +576,7 @@ static struct ext2_inode *find_inode_by_path(const char *path, struct ext2_inode struct device *dev) { if (path[0] != '/') - return 0; + return NULL; char *path_cp = strdup(path); char *init = path_cp; // For freeing @@ -560,7 +598,7 @@ static struct ext2_inode *find_inode_by_path(const char *path, struct ext2_inode if (current_inode == 0) { free(init); - return 0; + return NULL; } path_cp += i + 1; @@ -569,7 +607,7 @@ static struct ext2_inode *find_inode_by_path(const char *path, struct ext2_inode u32 inode = find_inode(path_cp, current_inode, dev); free(init); if ((signed)inode <= 0) - return 0; + return NULL; return get_inode(inode, in_buf, dev); } @@ -580,17 +618,14 @@ s32 ext2_read(const char *path, void *buf, u32 offset, u32 count, struct device if (find_inode_by_path(path, &in, dev) == &in) return read_inode(&in, buf, offset, count, dev); else - return -1; + return -ENOENT; } s32 ext2_stat(const char *path, struct stat *buf, struct device *dev) { - if (!buf) - return -1; - struct ext2_inode in = { 0 }; if (find_inode_by_path(path, &in, dev) != &in) - return -1; + return -ENOENT; u32 num_blocks = in.blocks / (BLOCK_SIZE / SECTOR_SIZE); u32 sz = BLOCK_SIZE * num_blocks; @@ -601,11 +636,11 @@ s32 ext2_stat(const char *path, struct stat *buf, struct device *dev) return 0; } -u8 ext2_perm(const char *path, enum vfs_perm perm, struct device *dev) +s32 ext2_perm(const char *path, enum vfs_perm perm, struct device *dev) { struct ext2_inode in = { 0 }; if (find_inode_by_path(path, &in, dev) != &in) - return 0; + return -ENOENT; switch (perm) { case VFS_EXEC: @@ -619,9 +654,9 @@ u8 ext2_perm(const char *path, enum vfs_perm perm, struct device *dev) } } -u8 ext2_ready(const char *path, struct device *dev) +s32 ext2_ready(const char *path, struct device *dev) { - (void)path; - (void)dev; + UNUSED(path); + UNUSED(dev); return 1; } diff --git a/kernel/features/load.c b/kernel/features/load.c index 9e6db79..65d76d4 100644 --- a/kernel/features/load.c +++ b/kernel/features/load.c @@ -1,17 +1,27 @@ // MIT License, Copyright (c) 2020 Marvin Borner +#include <errno.h> #include <fs.h> #include <load.h> #include <mem.h> #include <mm.h> #include <str.h> +#include <print.h> + #define PROC_STACK_SIZE 0x4000 -int bin_load(const char *path, struct proc *proc) +s32 bin_load(const char *path, struct proc *proc) { + if (!path || !memory_valid(path) || !proc) + return -EFAULT; + struct stat s = { 0 }; - vfs_stat(path, &s); + memory_bypass_enable(); + s32 stat = vfs_stat(path, &s); + memory_bypass_disable(); + if (stat != 0) + return stat; strcpy(proc->name, path); @@ -22,9 +32,12 @@ int bin_load(const char *path, struct proc *proc) u32 size = PAGE_ALIGN_UP(s.size); u32 data = (u32)memory_alloc(proc->page_dir, size, MEMORY_USER | MEMORY_CLEAR); - if (!vfs_read(proc->name, (void *)data, 0, s.size)) { + memory_bypass_enable(); + s32 read = vfs_read(proc->name, (void *)data, 0, s.size); + memory_bypass_disable(); + if (read <= 0) { memory_switch_dir(prev); - return 1; + return read; } u32 stack = (u32)memory_alloc(proc->page_dir, PROC_STACK_SIZE, MEMORY_USER | MEMORY_CLEAR); diff --git a/kernel/features/mm.c b/kernel/features/mm.c index 875d752..2171598 100644 --- a/kernel/features/mm.c +++ b/kernel/features/mm.c @@ -331,9 +331,7 @@ struct page_dir *virtual_kernel_dir(void) void *memory_alloc(struct page_dir *dir, u32 size, u32 flags) { - assert(PAGE_ALIGNED(size)); - - if (!size) + if (!PAGE_ALIGNED(size) || !size) goto err; struct memory_range prange = physical_alloc(size); @@ -352,8 +350,8 @@ void *memory_alloc(struct page_dir *dir, u32 size, u32 flags) return (void *)vaddr; err: - print("Memory allocation error!\n"); - return 0; + printf("Memory allocation error!\n"); + return NULL; } void *memory_alloc_identity(struct page_dir *dir, u32 flags) @@ -411,10 +409,24 @@ void memory_backup_dir(struct page_dir **backup) *backup = dir; } -// TODO: Check memory validity more often -u8 memory_user_valid(u32 addr) +// TODO: Verify that this isn't a huge security risk +static u8 memory_bypass_validity = 0; +void memory_bypass_enable(void) +{ + memory_bypass_validity = 1; +} + +void memory_bypass_disable(void) +{ + memory_bypass_validity = 0; +} + +u8 memory_valid(const void *addr) { - return addr / PAGE_SIZE / PAGE_COUNT >= PAGE_KERNEL_COUNT; + if (proc_current() && !memory_bypass_validity) + return ((u32)addr) / PAGE_SIZE / PAGE_COUNT >= PAGE_KERNEL_COUNT; + else + return 1; } struct memory_range memory_range_from(u32 base, u32 size) diff --git a/kernel/features/proc.c b/kernel/features/proc.c index b93f7c8..cd0fc8d 100644 --- a/kernel/features/proc.c +++ b/kernel/features/proc.c @@ -3,6 +3,7 @@ #include <assert.h> #include <boot.h> #include <cpu.h> +#include <errno.h> #include <fs.h> #include <load.h> #include <mem.h> @@ -260,6 +261,8 @@ struct proc *proc_make(enum proc_priv priv) void proc_stack_push(struct proc *proc, u32 data) { + assert(proc && proc->regs.useresp > sizeof(data)); + struct page_dir *prev; memory_backup_dir(&prev); memory_switch_dir(proc->page_dir); @@ -361,7 +364,7 @@ static s32 procfs_read(const char *path, void *buf, u32 offset, u32 count, struc if (pid) { struct proc *p = proc_from_pid(pid); if (!p || path[0] != '/') - return -1; + return -ENOENT; path++; if (!memcmp(path, "pid", 4)) { @@ -377,11 +380,11 @@ static s32 procfs_read(const char *path, void *buf, u32 offset, u32 count, struc return count; } else if (!memcmp(path, "msg", 4)) { if (stack_empty(p->messages)) { - return -1; // This shouldn't happen + return -EIO; // This shouldn't happen } else { struct procfs_message *msg = stack_pop(p->messages); if (!msg) - return -1; + return -EIO; memcpy(buf, msg->data + offset, MIN(count, msg->size)); free(msg->data); free(msg); @@ -391,7 +394,7 @@ static s32 procfs_read(const char *path, void *buf, u32 offset, u32 count, struc path += 3; enum stream_defaults id = procfs_stream(path); if (id == STREAM_UNKNOWN) - return -1; + return -ENOENT; struct stream *stream = &p->streams[id]; memcpy(buf, stream->data + stream->offset_read, count); stream->offset_read += count; @@ -399,7 +402,7 @@ static s32 procfs_read(const char *path, void *buf, u32 offset, u32 count, struc } } - return -1; + return -ENOENT; } static s32 procfs_wait(const char *path, u32 func_ptr, struct device *dev) @@ -410,22 +413,22 @@ static s32 procfs_wait(const char *path, u32 func_ptr, struct device *dev) if (pid) { struct proc *p = proc_from_pid(pid); if (!p || path[0] != '/') - return -1; + return -ENOENT; path++; if (!memcmp(path, "msg", 4)) { proc_wait_for(pid, PROC_WAIT_MSG, func_ptr); - return 1; + return 0; } else { proc_wait_for(dev->id, PROC_WAIT_DEV, func_ptr); - return 1; + return 0; } } - return -1; + return -ENOENT; } -static u8 procfs_perm(const char *path, enum vfs_perm perm, struct device *dev) +static s32 procfs_perm(const char *path, enum vfs_perm perm, struct device *dev) { (void)path; (void)dev; @@ -436,7 +439,7 @@ static u8 procfs_perm(const char *path, enum vfs_perm perm, struct device *dev) return 1; } -static u8 procfs_ready(const char *path, struct device *dev) +static s32 procfs_ready(const char *path, struct device *dev) { (void)dev; @@ -446,7 +449,7 @@ static u8 procfs_ready(const char *path, struct device *dev) if (pid) { struct proc *p = proc_from_pid(pid); if (!p || path[0] != '/') - return -1; + return -ENOENT; path++; if (!memcmp(path, "msg", 4)) { @@ -455,7 +458,7 @@ static u8 procfs_ready(const char *path, struct device *dev) path += 3; enum stream_defaults id = procfs_stream(path); if (id == STREAM_UNKNOWN) - return -1; + return -ENOENT; struct stream *stream = &p->streams[id]; return stream->data[stream->offset_read] != 0; } @@ -490,26 +493,26 @@ void proc_init(void) dev->type = DEV_CHAR; dev->vfs = vfs; device_add(dev); - vfs_mount(dev, "/proc/"); + assert(vfs_mount(dev, "/proc/") == 0); // Idle proc struct proc *kernel_proc = proc_make(PROC_PRIV_NONE); - bin_load("/bin/idle", kernel_proc); + assert(bin_load("/bin/idle", kernel_proc) == 0); kernel_proc->state = PROC_SLEEPING; idle_proc = list_add(proc_list, kernel_proc); // Init proc (root) struct node *new = list_add(proc_list, proc_make(PROC_PRIV_ROOT)); - bin_load("/bin/init", new->data); + assert(bin_load("/bin/init", new->data) == 0); current = new; proc_stack_push(new->data, 0); _eip = ((struct proc *)new->data)->regs.eip; _esp = ((struct proc *)new->data)->regs.useresp; - printf("Jumping to userspace!\n"); memory_switch_dir(((struct proc *)new->data)->page_dir); + printf("Jumping to userspace!\n"); // You're waiting for a train. A train that will take you far away... proc_jump_userspace(); diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c index 68bcbaa..b0b37ac 100644 --- a/kernel/features/syscall.c +++ b/kernel/features/syscall.c @@ -1,6 +1,7 @@ // MIT License, Copyright (c) 2020 Marvin Borner #include <cpu.h> +#include <errno.h> #include <fs.h> #include <interrupts.h> #include <load.h> @@ -24,6 +25,7 @@ static void syscall_handler(struct regs *r) switch (num) { case SYS_LOOP: { loop(); + panic("Fell out of the looping!\n"); break; } case SYS_ALLOC: { @@ -43,8 +45,9 @@ static void syscall_handler(struct regs *r) if (vfs_ready((char *)r->ebx)) { r->eax = (u32)vfs_read((char *)r->ebx, (void *)r->ecx, r->edx, r->esi); } else { - if (vfs_wait((char *)r->ebx, (u32)vfs_read) < 0) - r->eax = -1; + s32 wait = vfs_wait((char *)r->ebx, (u32)vfs_read); + if (wait != 0) + r->eax = wait; else proc_yield(r); } @@ -61,20 +64,19 @@ static void syscall_handler(struct regs *r) } case SYS_POLL: { s32 ret = vfs_poll((const char **)r->ebx); + r->eax = ret; if (ret == PROC_MAX_WAIT_IDS + 1) proc_yield(r); - else - r->eax = ret; break; } case SYS_EXEC: { char *path = (char *)r->ebx; struct proc *proc = proc_make(PROC_PRIV_NONE); r->eax = (u32)bin_load(path, proc); + if (r->eax != 0) + proc_exit(proc, -r->eax); // TODO: Reimplement argc,argv proc_stack_push(proc, 0); - if (r->eax) - proc_exit(proc, (int)r->eax); proc_yield(r); break; } @@ -83,10 +85,13 @@ static void syscall_handler(struct regs *r) break; } case SYS_BOOT: { // TODO: Move - if (r->ebx != SYS_BOOT_MAGIC || !proc_super()) { - r->eax = -1; + if (r->ebx != SYS_BOOT_MAGIC) { + r->eax = -EINVAL; break; } + if (!proc_super()) { + r->eax = -EACCES; + } switch (r->ecx) { case SYS_BOOT_REBOOT: print("Rebooting...\n"); @@ -102,7 +107,7 @@ static void syscall_handler(struct regs *r) __asm__ volatile("ud2"); break; default: - r->eax = -1; + r->eax = -EINVAL; } break; } @@ -114,6 +119,13 @@ static void syscall_handler(struct regs *r) r->eax = timer_get(); break; } + // TODO: Reimplement network functions using VFS + case SYS_NET_OPEN: + case SYS_NET_CLOSE: + case SYS_NET_CONNECT: + case SYS_NET_SEND: + case SYS_NET_RECEIVE: +#if 0 case SYS_NET_OPEN: { r->eax = (int)net_open(r->ebx); break; @@ -146,6 +158,7 @@ static void syscall_handler(struct regs *r) r->eax = net_receive((void *)r->ebx, (void *)r->ecx, r->edx); break; } +#endif default: { printf("Unknown syscall %d!\n", num); break; diff --git a/kernel/inc/fb.h b/kernel/inc/fb.h index 3e7b08f..212230b 100644 --- a/kernel/inc/fb.h +++ b/kernel/inc/fb.h @@ -1,7 +1,7 @@ // MIT License, Copyright (c) 2021 Marvin Borner -#ifndef FB -#define FB +#ifndef FB_H +#define FB_H #include <boot.h> diff --git a/kernel/inc/fs.h b/kernel/inc/fs.h index cd97b99..fd5c470 100644 --- a/kernel/inc/fs.h +++ b/kernel/inc/fs.h @@ -21,7 +21,7 @@ struct device { s32 (*read)(void *buf, u32 offset, u32 count, struct device *dev); s32 (*write)(void *buf, u32 offset, u32 count, struct device *dev); s32 (*ioctl)(u32 request, void *arg1, void *arg2, void *arg3, struct device *dev); - u8 (*ready)(void); + s32 (*ready)(void); }; void device_install(void); @@ -45,8 +45,8 @@ struct vfs { struct device *dev); s32 (*stat)(const char *path, struct stat *buf, struct device *dev); s32 (*wait)(const char *path, u32 func_ptr, struct device *dev); - u8 (*perm)(const char *path, enum vfs_perm perm, struct device *dev); - u8 (*ready)(const char *path, struct device *dev); + s32 (*ready)(const char *path, struct device *dev); + s32 (*perm)(const char *path, enum vfs_perm perm, struct device *dev); }; struct mount_info { @@ -67,7 +67,7 @@ s32 vfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3) s32 vfs_stat(const char *path, struct stat *buf); s32 vfs_wait(const char *path, u32 func_ptr); s32 vfs_poll(const char **files); -u8 vfs_ready(const char *path); +s32 vfs_ready(const char *path); struct device *device_get_by_name(const char *name); struct device *device_get_by_id(u32 id); @@ -176,7 +176,7 @@ struct ext2_file { s32 ext2_read(const char *path, void *buf, u32 offset, u32 count, struct device *dev); s32 ext2_stat(const char *path, struct stat *buf, struct device *dev); -u8 ext2_perm(const char *path, enum vfs_perm perm, struct device *dev); -u8 ext2_ready(const char *path, struct device *dev); +s32 ext2_perm(const char *path, enum vfs_perm perm, struct device *dev); +s32 ext2_ready(const char *path, struct device *dev); #endif diff --git a/kernel/inc/load.h b/kernel/inc/load.h index f493e84..bd3b10d 100644 --- a/kernel/inc/load.h +++ b/kernel/inc/load.h @@ -3,8 +3,9 @@ #ifndef LOAD_H #define LOAD_H +#include <def.h> #include <proc.h> -int bin_load(const char *path, struct proc *proc); +s32 bin_load(const char *path, struct proc *proc); #endif diff --git a/kernel/inc/mm.h b/kernel/inc/mm.h index fa2ebd1..98dcf46 100644 --- a/kernel/inc/mm.h +++ b/kernel/inc/mm.h @@ -101,7 +101,11 @@ void memory_map_identity(struct page_dir *dir, struct memory_range prange, u32 f void memory_free(struct page_dir *dir, struct memory_range vrange); void memory_switch_dir(struct page_dir *dir); void memory_backup_dir(struct page_dir **backup); -u8 memory_user_valid(u32 addr); + +// Bypass should almost never be used +void memory_bypass_enable(void); +void memory_bypass_disable(void); +u8 memory_valid(const void *addr); void memory_install(struct mem_info *mem_info, struct vid_info *vid_info); diff --git a/libc/Makefile b/libc/Makefile index 3bf4473..2dd2c5f 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -1,7 +1,8 @@ # MIT License, Copyright (c) 2020 Marvin Borner -# TODO: Remove serial and cpu from libc? +# TODO: Remove cpu from libc? COBJS = sanitize.o \ + errno.o \ str.o \ alloc.o \ mem.o \ diff --git a/libc/errno.c b/libc/errno.c new file mode 100644 index 0000000..7204f5b --- /dev/null +++ b/libc/errno.c @@ -0,0 +1,14 @@ +// MIT License, Copyright (c) 2021 Marvin Borner + +#include <def.h> +#include <errno.h> +#ifdef userspace + +static u32 error = 0; + +u32 *__errno(void) +{ + return &error; +} + +#endif diff --git a/libc/inc/errno.h b/libc/inc/errno.h new file mode 100644 index 0000000..76b4b85 --- /dev/null +++ b/libc/inc/errno.h @@ -0,0 +1,49 @@ +// MIT License, Copyright (c) 2021 Marvin Borner + +#ifndef ERRNO_H +#define ERRNO_H + +#include <def.h> + +#define EPERM 1 /* Operation not permitted */ +#define ENOENT 2 /* No such file or directory */ +#define ESRCH 3 /* No such process */ +#define EINTR 4 /* Interrupted system call */ +#define EIO 5 /* I/O error */ +#define ENXIO 6 /* No such device or address */ +#define E2BIG 7 /* Argument list too long */ +#define ENOEXEC 8 /* Exec format error */ +#define EBADF 9 /* Bad file number */ +#define ECHILD 10 /* No child processes */ +#define EAGAIN 11 /* Try again */ +#define ENOMEM 12 /* Out of memory */ +#define EACCES 13 /* Permission denied */ +#define EFAULT 14 /* Bad address */ +#define ENOTBLK 15 /* Block device required */ +#define EBUSY 16 /* Device or resource busy */ +#define EEXIST 17 /* File exists */ +#define EXDEV 18 /* Cross-device link */ +#define ENODEV 19 /* No such device */ +#define ENOTDIR 20 /* Not a directory */ +#define EISDIR 21 /* Is a directory */ +#define EINVAL 22 /* Invalid argument */ +#define ENFILE 23 /* File table overflow */ +#define EMFILE 24 /* Too many open files */ +#define ENOTTY 25 /* Not a typewriter */ +#define ETXTBSY 26 /* Text file busy */ +#define EFBIG 27 /* File too large */ +#define ENOSPC 28 /* No space left on device */ +#define ESPIPE 29 /* Illegal seek */ +#define EROFS 30 /* Read-only file system */ +#define EMLINK 31 /* Too many links */ +#define EPIPE 32 /* Broken pipe */ +#define EDOM 33 /* Math argument out of domain of func */ +#define ERANGE 34 /* Math result not representable */ +#define EMAX 35 /* Max errno */ + +#ifdef userspace +#define errno (*__errno()) +extern u32 *__errno(void); +#endif + +#endif diff --git a/libc/inc/str.h b/libc/inc/str.h index 0ef49a6..d0a521f 100644 --- a/libc/inc/str.h +++ b/libc/inc/str.h @@ -17,4 +17,6 @@ int strncmp(const char *s1, const char *s2, u32 n); char *strinv(char *s); char *strdup(const char *s); +const char *strerror(u32 err); + #endif diff --git a/libc/print.c b/libc/print.c index 1c577e5..b687239 100644 --- a/libc/print.c +++ b/libc/print.c @@ -158,8 +158,10 @@ int print(const char *str) // The kernel prints everything into the serial console +#include <mm.h> #include <proc.h> #include <serial.h> + #define RED "\x1B[1;31m" #define GRN "\x1B[1;32m" #define YEL "\x1B[1;33m" @@ -223,6 +225,8 @@ void print_trace(u32 count) __asm__ volatile("movl %%ebp, %0;" : "=r"(stk)); print("EBP\tEIP\n"); for (u32 i = 0; stk && i < count; i++) { + /* u32 eip = memory_valid((void *)stk->eip) ? stk->eip : stk->eip + 64; */ + /* printf("0x%x\t0x%x\n", stk->ebp, eip); */ printf("0x%x\t0x%x\n", stk->ebp, stk->eip); stk = stk->ebp; } @@ -240,6 +244,7 @@ NORETURN void panic(const char *format, ...) #ifdef kernel print("--- DON'T PANIC! ---\n"); print(buf); + print_trace(5); loop(); #else err(1, buf); diff --git a/libc/random.c b/libc/random.c index cfd082d..2801029 100644 --- a/libc/random.c +++ b/libc/random.c @@ -19,7 +19,10 @@ u32 rdrand(void) return rand(); u32 rd; - __asm__ volatile("rdrand %%eax" : "=a"(rd)); + __asm__ volatile("1:\n" + "rdrand %0\n" + "jnc 1b\n" + : "=r"(rd)); return rd; #else return rand(); @@ -33,7 +36,10 @@ u32 rdseed(void) return rand(); u32 rd; - __asm__ volatile("rdseed %%eax" : "=a"(rd)); + __asm__ volatile("1:\n" + "rdseed %0\n" + "jnc 1b\n" + : "=r"(rd)); return rd; #else return rand(); @@ -1,6 +1,7 @@ // MIT License, Copyright (c) 2020 Marvin Borner #include <def.h> +#include <errno.h> #include <mem.h> #include <str.h> @@ -124,3 +125,48 @@ char *strdup(const char *s) return d; } + +static const char *strerrors[EMAX] = { + "Success", + "Operation not permitted", + "No such file or directory", + "No such process", + "Interrupted system call", + "I/O error", + "No such device or address", + "Argument list too long", + "Exec format error", + "Bad file number", + "No child processes", + "Try again", + "Out of memory", + "Permission denied", + "Bad address", + "Block device required", + "Device or resource busy", + "File exists", + "Cross-device link", + "No such device", + "Not a directory", + "Is a directory", + "Invalid argument", + "File table overflow", + "Too many open files", + "Not a typewriter", + "Text file busy", + "File too large", + "No space left on device", + "Illegal seek", + "Read-only file system", + "Too many links", + "Broken pipe", + "Math argument out of domain of func", + "Math result not representable", +}; + +const char *strerror(u32 error) +{ + if (error <= EMAX) + return strerrors[error]; + return "Unknown error"; +} @@ -2,6 +2,7 @@ // Syscall implementation #include <arg.h> +#include <errno.h> #include <sys.h> #if defined(userspace) @@ -10,25 +11,32 @@ * Definitions */ +#define ERRIFY(ret) \ + if (ret < 0) { \ + errno = -ret; \ + return -1; \ + } \ + return ret + int sys0(enum sys num) { int a; __asm__ volatile("int $0x80" : "=a"(a) : "0"(num)); - return a; + ERRIFY(a); } int sys1(enum sys num, int d1) { int a; __asm__ volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)d1)); - return a; + ERRIFY(a); } int sys2(enum sys num, int d1, int d2) { int a; __asm__ volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)d1), "c"((int)d2)); - return a; + ERRIFY(a); } int sys3(enum sys num, int d1, int d2, int d3) @@ -37,7 +45,7 @@ int sys3(enum sys num, int d1, int d2, int d3) __asm__ volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)d1), "c"((int)d2), "d"((int)d3)); - return a; + ERRIFY(a); } int sys4(enum sys num, int d1, int d2, int d3, int d4) @@ -46,7 +54,7 @@ int sys4(enum sys num, int d1, int d2, int d3, int d4) __asm__ volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)d1), "c"((int)d2), "d"((int)d3), "S"((int)d4)); - return a; + ERRIFY(a); } int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5) @@ -56,7 +64,7 @@ int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5) : "=a"(a) : "0"(num), "b"((int)d1), "c"((int)d2), "d"((int)d3), "S"((int)d4), "D"((int)d5)); - return a; + ERRIFY(a); } int sysv(enum sys num, ...) |