From 394ee169ea6eb4dd5c8fa778d1c2769e26e52f01 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sat, 3 Apr 2021 14:04:23 +0200 Subject: Enabled SMAP/SMEP protections --- libs/libc/inc/mem.h | 12 ++++++-- libs/libc/inc/str.h | 22 +++++++++++--- libs/libc/mem.c | 42 +++++++++++++++++++++++-- libs/libc/print.c | 3 ++ libs/libc/random.c | 4 +-- libs/libc/str.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 6 files changed, 156 insertions(+), 15 deletions(-) (limited to 'libs') diff --git a/libs/libc/inc/mem.h b/libs/libc/inc/mem.h index 960ee86..7318c25 100644 --- a/libs/libc/inc/mem.h +++ b/libs/libc/inc/mem.h @@ -21,7 +21,15 @@ void *zalloc(u32 size); void *memcpy(void *dest, const void *src, u32 n) NONNULL; void *memset(void *dest, u32 val, u32 n) NONNULL; void *memchr(void *src, char c, u32 n) NONNULL; -int memcmp(const void *s1, const void *s2, u32 n) NONNULL; -int mememp(const u8 *buf, u32 n) NONNULL; +s32 memcmp(const void *s1, const void *s2, u32 n) NONNULL; +u8 mememp(const u8 *buf, u32 n) NONNULL; + +#ifdef KERNEL +void *memcpy_user(void *dest, const void *src, u32 n) NONNULL; +void *memset_user(void *dest, u32 val, u32 n) NONNULL; +void *memchr_user(void *src, char c, u32 n) NONNULL; +s32 memcmp_user(const void *s1, const void *s2, u32 n) NONNULL; +u8 mememp_user(const u8 *buf, u32 n) NONNULL; +#endif #endif diff --git a/libs/libc/inc/str.h b/libs/libc/inc/str.h index e77eeee..b00750b 100644 --- a/libs/libc/inc/str.h +++ b/libs/libc/inc/str.h @@ -7,14 +7,28 @@ u32 strlen(const char *s) NONNULL; u32 strlcpy(char *dst, const char *src, u32 size) NONNULL; -char *strchr(char *s, int c) NONNULL; -char *strrchr(char *s, int c) NONNULL; +char *strchr(char *s, char c) NONNULL; +char *strrchr(char *s, char c) NONNULL; u32 strlcat(char *dst, const char *src, u32 size) NONNULL; -int strcmp(const char *s1, const char *s2) NONNULL; -int strncmp(const char *s1, const char *s2, u32 n) NONNULL; +s32 strcmp(const char *s1, const char *s2) NONNULL; +s32 strncmp(const char *s1, const char *s2, u32 n) NONNULL; char *strinv(char *s) NONNULL; char *strdup(const char *s) NONNULL; +#ifdef KERNEL + +u32 strlen_user(const char *s) NONNULL; +u32 strlcpy_user(char *dst, const char *src, u32 size) NONNULL; +char *strchr_user(char *s, char c) NONNULL; +char *strrchr_user(char *s, char c) NONNULL; +u32 strlcat_user(char *dst, const char *src, u32 size) NONNULL; +s32 strcmp_user(const char *s1, const char *s2) NONNULL; +s32 strncmp_user(const char *s1, const char *s2, u32 n) NONNULL; +char *strinv_user(char *s) NONNULL; +char *strdup_user(const char *s) NONNULL; + +#endif + const char *strerror(u32 err); #endif diff --git a/libs/libc/mem.c b/libs/libc/mem.c index ad691ed..babec3a 100644 --- a/libs/libc/mem.c +++ b/libs/libc/mem.c @@ -102,7 +102,7 @@ void *memchr(void *src, char c, u32 n) return NULL; } -int memcmp(const void *s1, const void *s2, u32 n) +s32 memcmp(const void *s1, const void *s2, u32 n) { const u8 *a = (const u8 *)s1; const u8 *b = (const u8 *)s2; @@ -115,7 +115,45 @@ int memcmp(const void *s1, const void *s2, u32 n) return 0; } -int mememp(const u8 *buf, u32 n) +u8 mememp(const u8 *buf, u32 n) { return buf[0] == 0 && !memcmp(buf, buf + 1, n - 1); } + +#ifdef KERNEL + +#include + +void *memcpy_user(void *dest, const void *src, u32 n) +{ + stac(); + void *ret = memcpy(dest, src, n); + clac(); + return ret; +} + +void *memset_user(void *dest, u32 val, u32 n) +{ + stac(); + void *ret = memset(dest, val, n); + clac(); + return ret; +} + +void *memchr_user(void *src, char c, u32 n) +{ + stac(); + void *ret = memchr(src, c, n); + clac(); + return ret; +} + +s32 memcmp_user(const void *s1, const void *s2, u32 n) +{ + stac(); + s32 ret = memcmp(s1, s2, n); + clac(); + return ret; +} + +#endif diff --git a/libs/libc/print.c b/libs/libc/print.c index 4c38cdc..dcaa8cb 100644 --- a/libs/libc/print.c +++ b/libs/libc/print.c @@ -164,6 +164,7 @@ int print(const char *str) // The kernel prints everything into the serial console +#include #include #include #include @@ -211,7 +212,9 @@ int print_app(enum stream_defaults id, const char *proc_name, const char *str) serial_print(YEL "[ERR] to "); serial_print(proc_name); serial_print(": "); + stac(); serial_print(str); + clac(); serial_print(RES); return 1; } diff --git a/libs/libc/random.c b/libs/libc/random.c index 6e65959..6296407 100644 --- a/libs/libc/random.c +++ b/libs/libc/random.c @@ -18,7 +18,7 @@ void srand(u32 seed) u32 rdrand(void) { #ifdef KERNEL - if (!cpu_has_cfeature(CPUID_FEAT_ECX_RDRND)) + if (!(cpu_features.ecx & CPUID_FEAT_ECX_RDRND)) return rand(); u32 rd; @@ -35,7 +35,7 @@ u32 rdrand(void) u32 rdseed(void) { #ifdef KERNEL - if (!cpu_has_cfeature(CPUID_FEAT_ECX_RDRND)) + if (!(cpu_extended_features.ebx & CPUID_EXT_FEAT_EBX_RDSEED)) return rand(); u32 rd; diff --git a/libs/libc/str.c b/libs/libc/str.c index 3bc3aaf..52af5c4 100644 --- a/libs/libc/str.c +++ b/libs/libc/str.c @@ -33,7 +33,7 @@ u32 strlcpy(char *dst, const char *src, u32 size) return src - orig - 1; } -int strcmp(const char *s1, const char *s2) +s32 strcmp(const char *s1, const char *s2) { const u8 *c1 = (const u8 *)s1; const u8 *c2 = (const u8 *)s2; @@ -49,7 +49,7 @@ int strcmp(const char *s1, const char *s2) return d; } -int strncmp(const char *s1, const char *s2, u32 n) +s32 strncmp(const char *s1, const char *s2, u32 n) { const u8 *c1 = (const u8 *)s1; const u8 *c2 = (const u8 *)s2; @@ -65,9 +65,9 @@ int strncmp(const char *s1, const char *s2, u32 n) return d; } -char *strchr(char *s, int c) +char *strchr(char *s, char c) { - while (*s != (char)c) { + while (*s != c) { if (!*s) return NULL; s++; @@ -76,7 +76,7 @@ char *strchr(char *s, int c) return s; } -char *strrchr(char *s, int c) +char *strrchr(char *s, char c) { char *ret = 0; @@ -218,3 +218,81 @@ const char *strerror(u32 error) return "Unknown error"; } } + +#ifdef KERNEL + +#include + +u32 strlen_user(const char *str) +{ + stac(); + u32 ret = strlen(str); + clac(); + return ret; +} + +u32 strlcpy_user(char *dst, const char *src, u32 size) +{ + stac(); + u32 ret = strlcpy(dst, src, size); + clac(); + return ret; +} + +s32 strcmp_user(const char *s1, const char *s2) +{ + stac(); + s32 ret = strcmp(s1, s2); + clac(); + return ret; +} + +s32 strncmp_user(const char *s1, const char *s2, u32 n) +{ + stac(); + s32 ret = strncmp(s1, s2, n); + clac(); + return ret; +} + +char *strchr_user(char *s, char c) +{ + stac(); + char *ret = strchr(s, c); + clac(); + return ret; +} + +char *strrchr_user(char *s, char c) +{ + stac(); + char *ret = strrchr(s, c); + clac(); + return ret; +} + +u32 strlcat_user(char *dst, const char *src, u32 size) +{ + stac(); + u32 ret = strlcat(dst, src, size); + clac(); + return ret; +} + +char *strinv_user(char *s) +{ + stac(); + char *ret = strinv(s); + clac(); + return ret; +} + +char *strdup_user(const char *s) +{ + stac(); + char *ret = strdup(s); + clac(); + return ret; +} + +#endif -- cgit v1.2.3