Hardened syscalls

4 files changed, 31 insertions, 27 deletions

diff --git a/kernel/inc/fs.h b/kernel/inc/fs.h
index fd5c470..4b333ac 100644
--- a/kernel/inc/fs.h
+++ b/kernel/inc/fs.h
@@ -4,6 +4,7 @@
 #define FS_H
 
 #include <def.h>
+#include <errno.h>
 #include <sys.h>
 
 /**
@@ -18,10 +19,10 @@ struct device {
 	enum dev_type type;
 	struct vfs *vfs;
 	void *data;
-	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);
-	s32 (*ready)(void);
+	res (*read)(void *buf, u32 offset, u32 count, struct device *dev);
+	res (*write)(void *buf, u32 offset, u32 count, struct device *dev);
+	res (*ioctl)(u32 request, void *arg1, void *arg2, void *arg3, struct device *dev);
+	res (*ready)(void);
 };
 
 void device_install(void);
@@ -39,14 +40,14 @@ struct vfs {
 	enum vfs_type type;
 	int flags;
 	void *data;
-	s32 (*read)(const char *path, void *buf, u32 offset, u32 count, struct device *dev);
-	s32 (*write)(const char *path, void *buf, u32 offset, u32 count, struct device *dev);
-	s32 (*ioctl)(const char *path, u32 request, void *arg1, void *arg2, void *arg3,
+	res (*read)(const char *path, void *buf, u32 offset, u32 count, struct device *dev);
+	res (*write)(const char *path, void *buf, u32 offset, u32 count, struct device *dev);
+	res (*ioctl)(const char *path, u32 request, void *arg1, void *arg2, void *arg3,
 		     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);
-	s32 (*ready)(const char *path, struct device *dev);
-	s32 (*perm)(const char *path, enum vfs_perm perm, struct device *dev);
+	res (*stat)(const char *path, struct stat *buf, struct device *dev);
+	res (*wait)(const char *path, u32 func_ptr, struct device *dev);
+	res (*ready)(const char *path, struct device *dev);
+	res (*perm)(const char *path, enum vfs_perm perm, struct device *dev);
 };
 
 struct mount_info {
@@ -57,17 +58,17 @@ struct mount_info {
 void vfs_install(void);
 
 u8 vfs_mounted(struct device *dev, const char *path);
-s32 vfs_mount(struct device *dev, const char *path);
+res vfs_mount(struct device *dev, const char *path);
 
 struct device *vfs_find_dev(const char *path);
 
-s32 vfs_read(const char *path, void *buf, u32 offset, u32 count);
-s32 vfs_write(const char *path, void *buf, u32 offset, u32 count);
-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);
-s32 vfs_ready(const char *path);
+res vfs_read(const char *path, void *buf, u32 offset, u32 count);
+res vfs_write(const char *path, void *buf, u32 offset, u32 count);
+res vfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3);
+res vfs_stat(const char *path, struct stat *buf);
+res vfs_wait(const char *path, u32 func_ptr);
+res vfs_poll(const char **files);
+res vfs_ready(const char *path);
 
 struct device *device_get_by_name(const char *name);
 struct device *device_get_by_id(u32 id);
@@ -174,9 +175,9 @@ struct ext2_file {
 	u32 curr_block_pos;
 };
 
-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);
-s32 ext2_perm(const char *path, enum vfs_perm perm, struct device *dev);
-s32 ext2_ready(const char *path, struct device *dev);
+res ext2_read(const char *path, void *buf, u32 offset, u32 count, struct device *dev);
+res ext2_stat(const char *path, struct stat *buf, struct device *dev);
+res ext2_perm(const char *path, enum vfs_perm perm, struct device *dev);
+res ext2_ready(const char *path, struct device *dev);
 
 #endif
diff --git a/kernel/inc/load.h b/kernel/inc/load.h
index 54ace4e..363a70f 100644
--- a/kernel/inc/load.h
+++ b/kernel/inc/load.h
@@ -105,6 +105,6 @@ struct elf_program {
 	u32 align;
 };
 
-s32 elf_load(const char *path, struct proc *proc);
+res elf_load(const char *path, struct proc *proc);
 
 #endif
diff --git a/kernel/inc/mm.h b/kernel/inc/mm.h
index 5e30be6..5e49aa7 100644
--- a/kernel/inc/mm.h
+++ b/kernel/inc/mm.h
@@ -5,6 +5,7 @@
 
 #include <boot.h>
 #include <def.h>
+#include <errno.h>
 #include <interrupts.h>
 
 struct memory_range {
@@ -104,8 +105,6 @@ struct memory_range memory_range_around(u32 base, u32 size);
 
 void *memory_alloc(struct page_dir *dir, u32 size, u32 flags);
 void *memory_alloc_identity(struct page_dir *dir, u32 flags);
-u32 memory_shalloc(struct page_dir *dir, u32 size, u32 flags);
-void *memory_shaccess(struct page_dir *dir, u32 shid);
 void memory_free(struct page_dir *dir, struct memory_range vrange);
 void memory_map_identity(struct page_dir *dir, struct memory_range prange, u32 flags);
 void memory_switch_dir(struct page_dir *dir);
@@ -117,6 +116,10 @@ void memory_bypass_disable(void);
 u8 memory_is_user(u32 addr);
 u8 memory_valid(const void *addr);
 
+// User interface
+res memory_shalloc(struct page_dir *dir, u32 size, u32 *id, u32 flags);
+res memory_shaccess(struct page_dir *dir, u32 shid, u32 *addr, u32 *size);
+
 void memory_install(struct mem_info *mem_info, struct vid_info *vid_info);
 
 #endif
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index a44fd68..c946116 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -64,7 +64,7 @@ void proc_print(void);
 struct proc *proc_current(void);
 u8 proc_super(void);
 struct proc *proc_from_pid(u32 pid);
-void proc_exit(struct proc *proc, int status);
+void proc_exit(struct proc *proc, s32 status);
 void proc_yield(struct regs *r);
 void proc_clear_quantum(void);
 void proc_enable_waiting(u32 id, enum proc_wait_type type);