From 09c3bdb186868204cb03d457244e05e12eb685d6 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 21 Mar 2021 12:40:41 +0100
Subject: Hardened syscalls

---
 libc/inc/def.h   |  2 ++
 libc/inc/errno.h |  3 +++
 libc/inc/sys.h   | 21 +++++++++++----------
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'libc/inc')

diff --git a/libc/inc/def.h b/libc/inc/def.h
index c334fcb..708ffee 100644
--- a/libc/inc/def.h
+++ b/libc/inc/def.h
@@ -28,6 +28,8 @@ typedef unsigned long long u64;
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 
+#define ABS(a) (((a) < 0) ? (-a) : (a))
+
 #define NORETURN __attribute__((noreturn))
 #define NO_SANITIZE __attribute__((no_sanitize("undefined")))
 #define PACKED __attribute__((packed))
diff --git a/libc/inc/errno.h b/libc/inc/errno.h
index 76b4b85..e226aba 100644
--- a/libc/inc/errno.h
+++ b/libc/inc/errno.h
@@ -5,6 +5,9 @@
 
 #include <def.h>
 
+typedef s32 res;
+
+#define EOK 0 /* Success */
 #define EPERM 1 /* Operation not permitted */
 #define ENOENT 2 /* No such file or directory */
 #define ESRCH 3 /* No such process */
diff --git a/libc/inc/sys.h b/libc/inc/sys.h
index a06a792..8f30dbb 100644
--- a/libc/inc/sys.h
+++ b/libc/inc/sys.h
@@ -5,6 +5,7 @@
 #define SYS_H
 
 #include <def.h>
+#include <errno.h>
 
 #define KEYBOARD_MAGIC 0x555555
 #define MOUSE_MAGIC 0xaaaaaa
@@ -66,20 +67,20 @@ struct stat {
  */
 
 void loop(void);
-s32 read(const char *path, void *buf, u32 offset, u32 count);
-s32 write(const char *path, const void *buf, u32 offset, u32 count);
-s32 ioctl(const char *path, ...);
-s32 stat(const char *path, struct stat *buf);
-s32 poll(const char **files);
-s32 exec(const char *path, ...);
-s32 yield(void);
 void exit(s32 status);
-s32 boot(u32 cmd);
+res read(const char *path, void *buf, u32 offset, u32 count);
+res write(const char *path, const void *buf, u32 offset, u32 count);
+res ioctl(const char *path, ...);
+res stat(const char *path, struct stat *buf);
+res poll(const char **files);
+res exec(const char *path, ...);
+res yield(void);
+res boot(u32 cmd);
 u32 time(void);
 
 void *sys_alloc(u32 size);
-u32 shalloc(u32 size);
-void *shaccess(u32 id);
+res shalloc(u32 size, u32 *id);
+res shaccess(u32 id, u32 *addr, u32 *size);
 void sys_free(void *ptr, u32 size);
 
 static inline u32 getpid(void)
-- 
cgit v1.2.3