diff options
author | Marvin Borner | 2021-04-02 23:26:28 +0200 |
---|---|---|
committer | Marvin Borner | 2021-04-02 23:26:28 +0200 |
commit | ce98400f8a9ebd4e62e76b9e292b7598d0d66cc0 (patch) | |
tree | 823f06c2c325ead611863eeb3ac974c1ae562878 /libs/libc/inc | |
parent | fe468b476d567b6aa0695a030c408ccf46278c7d (diff) |
Added kernel section clear/protect after init
This is a huge security improvement as it prevents potential exploits
of using or modifying internal kernel functions or data.
Diffstat (limited to 'libs/libc/inc')
-rw-r--r-- | libs/libc/inc/cpu.h | 110 | ||||
-rw-r--r-- | libs/libc/inc/def.h | 9 | ||||
-rw-r--r-- | libs/libc/inc/print.h | 2 | ||||
-rw-r--r-- | libs/libc/inc/sys.h | 2 |
4 files changed, 9 insertions, 114 deletions
diff --git a/libs/libc/inc/cpu.h b/libs/libc/inc/cpu.h deleted file mode 100644 index 0410125..0000000 --- a/libs/libc/inc/cpu.h +++ /dev/null @@ -1,110 +0,0 @@ -// MIT License, Copyright (c) 2020 Marvin Borner - -#ifndef CPU_H -#define CPU_H - -#include <def.h> - -u8 inb(u16 port); -u16 inw(u16 port); -u32 inl(u16 port); -void insl(u16 port, void *addr, int n) ATTR((nonnull(2))); - -void outb(u16 port, u8 data); -void outw(u16 port, u16 data); -void outl(u16 port, u32 data); - -static inline void spinlock(u32 *ptr) -{ - u32 prev; - do - __asm__ volatile("lock xchgl %0,%1" : "=a"(prev) : "m"(*ptr), "a"(1)); - while (prev); -} - -#ifdef KERNEL -void cpu_print(void); -void cpu_enable_features(void); -void fpu_restore(void); - -u32 cr0_get(void); -void cr0_set(u32 cr0); -u32 cr3_get(void); -void cr3_set(u32 cr3); -u32 cr4_get(void); -void cr4_set(u32 cr4); - -void cli(void); -void sti(void); -void hlt(void); -void idle(void); -void loop(void); - -enum cpuid_requests { CPUID_VENDOR_STRING, CPUID_FEATURES, CPUID_TLB, CPUID_SERIAL }; -enum cpuid_features { - CPUID_FEAT_ECX_SSE3 = 1u << 0, - CPUID_FEAT_ECX_PCLMUL = 1u << 1, - CPUID_FEAT_ECX_DTES64 = 1u << 2, - CPUID_FEAT_ECX_MONITOR = 1u << 3, - CPUID_FEAT_ECX_DS_CPL = 1u << 4, - CPUID_FEAT_ECX_VMX = 1u << 5, - CPUID_FEAT_ECX_SMX = 1u << 6, - CPUID_FEAT_ECX_EST = 1u << 7, - CPUID_FEAT_ECX_TM2 = 1u << 8, - CPUID_FEAT_ECX_SSSE3 = 1u << 9, - CPUID_FEAT_ECX_CID = 1u << 10, - CPUID_FEAT_ECX_FMA = 1u << 12, - CPUID_FEAT_ECX_CX16 = 1u << 13, - CPUID_FEAT_ECX_ETPRD = 1u << 14, - CPUID_FEAT_ECX_PDCM = 1u << 15, - CPUID_FEAT_ECX_PCIDE = 1u << 17, - CPUID_FEAT_ECX_DCA = 1u << 18, - CPUID_FEAT_ECX_SSE4_1 = 1u << 19, - CPUID_FEAT_ECX_SSE4_2 = 1u << 20, - CPUID_FEAT_ECX_x2APIC = 1u << 21, - CPUID_FEAT_ECX_MOVBE = 1u << 22, - CPUID_FEAT_ECX_POPCNT = 1u << 23, - CPUID_FEAT_ECX_AES = 1u << 25, - CPUID_FEAT_ECX_XSAVE = 1u << 26, - CPUID_FEAT_ECX_OSXSAVE = 1u << 27, - CPUID_FEAT_ECX_AVX = 1u << 28, - CPUID_FEAT_ECX_F16C = 1u << 29, - CPUID_FEAT_ECX_RDRND = 1u << 30, - - CPUID_FEAT_EDX_FPU = 1u << 0, - CPUID_FEAT_EDX_VME = 1u << 1, - CPUID_FEAT_EDX_DE = 1u << 2, - CPUID_FEAT_EDX_PSE = 1u << 3, - CPUID_FEAT_EDX_TSC = 1u << 4, - CPUID_FEAT_EDX_MSR = 1u << 5, - CPUID_FEAT_EDX_PAE = 1u << 6, - CPUID_FEAT_EDX_MCE = 1u << 7, - CPUID_FEAT_EDX_CX8 = 1u << 8, - CPUID_FEAT_EDX_APIC = 1u << 9, - CPUID_FEAT_EDX_SEP = 1u << 11, - CPUID_FEAT_EDX_MTRR = 1u << 12, - CPUID_FEAT_EDX_PGE = 1u << 13, - CPUID_FEAT_EDX_MCA = 1u << 14, - CPUID_FEAT_EDX_CMOV = 1u << 15, - CPUID_FEAT_EDX_PAT = 1u << 16, - CPUID_FEAT_EDX_PSE36 = 1u << 17, - CPUID_FEAT_EDX_PSN = 1u << 18, - CPUID_FEAT_EDX_CLF = 1u << 19, - CPUID_FEAT_EDX_DTES = 1u << 21, - CPUID_FEAT_EDX_ACPI = 1u << 22, - CPUID_FEAT_EDX_MMX = 1u << 23, - CPUID_FEAT_EDX_FXSR = 1u << 24, - CPUID_FEAT_EDX_SSE = 1u << 25, - CPUID_FEAT_EDX_SSE2 = 1u << 26, - CPUID_FEAT_EDX_SS = 1u << 27, - CPUID_FEAT_EDX_HTT = 1u << 28, - CPUID_FEAT_EDX_TM1 = 1u << 29, - CPUID_FEAT_EDX_IA64 = 1u << 30, -}; - -u8 cpu_has_cfeature(enum cpuid_features feature); -u8 cpu_has_dfeature(enum cpuid_features feature); - -#endif - -#endif diff --git a/libs/libc/inc/def.h b/libs/libc/inc/def.h index 583a351..f1201b9 100644 --- a/libs/libc/inc/def.h +++ b/libs/libc/inc/def.h @@ -23,7 +23,7 @@ typedef unsigned long long u64; * Macros */ -#define UNUSED(__a) ((void)(__a)) +#define UNUSED(a) ((void)(a)) #define MIN(a, b) (((a) < (b)) ? (a) : (b)) #define MAX(a, b) (((a) > (b)) ? (a) : (b)) @@ -32,6 +32,7 @@ typedef unsigned long long u64; #define ATTR __attribute__ #define NORETURN ATTR((noreturn)) +#define NOINLINE ATTR((noinline)) #define DEPRECATED ATTR((deprecated)) #define NONNULL ATTR((nonnull)) #define PURE ATTR((pure)) @@ -44,7 +45,11 @@ typedef unsigned long long u64; #define UNUSED_FUNC ATTR((unused)) #define NO_SANITIZE ATTR((no_sanitize("undefined"))) #define ALIGNED(align) ATTR((aligned(align))) -#define SECTION(section) ATTR((section(section))) + +#ifdef KERNEL +#define CLEAR NOINLINE ATTR((section(".temp_clear"))) +#define PROTECTED ATTR((section(".temp_protect"))) +#endif #define EOF (-1) #define NULL ((void *)0) diff --git a/libs/libc/inc/print.h b/libs/libc/inc/print.h index c0d864e..1d85c33 100644 --- a/libs/libc/inc/print.h +++ b/libs/libc/inc/print.h @@ -17,7 +17,7 @@ NORETURN void panic(const char *format, ...) NONNULL; int vfprintf(const char *path, const char *format, va_list ap) NONNULL; int fprintf(const char *path, const char *format, ...) NONNULL; int log(const char *format, ...) NONNULL; -int err(int code, const char *format, ...) NONNULL; +void err(int code, const char *format, ...) NONNULL; #else #include <proc.h> int print_app(enum stream_defaults id, const char *proc_name, const char *str) NONNULL; diff --git a/libs/libc/inc/sys.h b/libs/libc/inc/sys.h index 81de724..b435899 100644 --- a/libs/libc/inc/sys.h +++ b/libs/libc/inc/sys.h @@ -66,7 +66,7 @@ struct stat { */ void loop(void); -void exit(s32 status); +void exit(s32 status) NORETURN; res read(const char *path, void *buf, u32 offset, u32 count) NONNULL; res write(const char *path, const void *buf, u32 offset, u32 count) NONNULL; res ioctl(const char *path, ...) NONNULL; |