From 88a8745e45f525e5fb12b6b048df87afabebbfc9 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Tue, 3 Jun 2025 23:14:16 +0200 Subject: feat: TLS: Improved its implementation, and add a user field for additional checks. refactor: Reworked `open_msg`'s messaging system. refactor: Rename `Utils.cc` to `AsciiUtils.cc` Signed-off-by: Amlal El Mahrouss --- dev/kernel/KernelKit/ThreadLocalStorage.h | 4 +- dev/kernel/NeKit/Utils.h | 4 + dev/kernel/src/AsciiUtils.cc | 194 ++++++++++++++++++++++++++++++ dev/kernel/src/ThreadLocalStorage.cc | 21 +--- dev/kernel/src/Utils.cc | 194 ------------------------------ dev/open_msg/script/window.msg | 6 - dev/open_msg/script/window_client.json | 7 ++ 7 files changed, 212 insertions(+), 218 deletions(-) create mode 100644 dev/kernel/src/AsciiUtils.cc delete mode 100644 dev/kernel/src/Utils.cc delete mode 100644 dev/open_msg/script/window.msg create mode 100644 dev/open_msg/script/window_client.json (limited to 'dev') diff --git a/dev/kernel/KernelKit/ThreadLocalStorage.h b/dev/kernel/KernelKit/ThreadLocalStorage.h index 6c764221..35c17db0 100644 --- a/dev/kernel/KernelKit/ThreadLocalStorage.h +++ b/dev/kernel/KernelKit/ThreadLocalStorage.h @@ -27,8 +27,8 @@ struct THREAD_INFORMATION_BLOCK; /// @brief Thread Information Block. /// Located in GS on AMD64, other architectures have their own stuff. (64x0, 32x0, ARM64) struct PACKED THREAD_INFORMATION_BLOCK final { - Kernel::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. - Kernel::VoidPtr Record{nullptr}; //! Thread information record. + Kernel::Char Cookie[kTLSCookieLen]{0}; //! Thread Magic Number. + Kernel::VoidPtr UserData{nullptr}; //! Thread Information Record (User defined canary structure) }; ///! @brief Cookie Sanity check. diff --git a/dev/kernel/NeKit/Utils.h b/dev/kernel/NeKit/Utils.h index cdfcfe56..43526fc8 100644 --- a/dev/kernel/NeKit/Utils.h +++ b/dev/kernel/NeKit/Utils.h @@ -10,6 +10,8 @@ #include namespace Kernel { +/// ASCII API + Int rt_copy_memory(const voidPtr src, voidPtr dst, Size len); Int rt_move_memory(const voidPtr src, voidPtr dst, Size len); voidPtr rt_set_memory(voidPtr dst, UInt32 val, Size len); @@ -27,6 +29,8 @@ Int rt_to_lower(Int c); voidPtr rt_string_in_string(const Char* in, const Char* needle); char* rt_string_has_char(Char* str, Char chr); +/// UNICODE API + Int urt_string_cmp(const Char* src, const Char* cmp, Size len); Void urt_set_memory(const voidPtr src, UInt32 dst, Size len); Int urt_copy_memory(const voidPtr src, voidPtr dst, Size len); diff --git a/dev/kernel/src/AsciiUtils.cc b/dev/kernel/src/AsciiUtils.cc new file mode 100644 index 00000000..087b6d5f --- /dev/null +++ b/dev/kernel/src/AsciiUtils.cc @@ -0,0 +1,194 @@ +/* ------------------------------------------- + + Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. + +------------------------------------------- */ + +#include + +namespace Kernel { + +STATIC Int rt_copy_memory_safe(const voidPtr src, voidPtr dst, Size len, Size dst_size); +STATIC voidPtr rt_set_memory_safe(voidPtr dst, UInt32 value, Size len, Size dst_size); + +Int32 rt_string_cmp(const Char* src, const Char* cmp, Size size) { + for (Size i = 0; i < size; ++i) { + if (src[i] != cmp[i]) + return static_cast(src[i]) - static_cast(cmp[i]); + } + return 0; +} + +SizeT rt_string_len(const Char* str, SizeT max_len) { + SizeT len = 0; + while (len < max_len && str[len] != '\0') + ++len; + return len; +} + +Size rt_string_len(const Char* ptr) { + Size cnt = 0; + while (ptr[cnt] != '\0') + ++cnt; + return cnt; +} + +const Char* rt_alloc_string(const Char* src) { + SizeT slen = rt_string_len(src); + Char* buffer = new Char[slen + 1]; + if (!buffer) return nullptr; + + if (rt_copy_memory_safe(reinterpret_cast(const_cast(src)), + reinterpret_cast(buffer), + slen, + slen + 1) < 0) { + delete[] buffer; + return nullptr; + } + + buffer[slen] = '\0'; + return buffer; +} + +STATIC Int rt_copy_memory_safe(const voidPtr src, voidPtr dst, Size len, Size dst_size) { + if (!src || !dst || len > dst_size) { + if (dst && dst_size) { + rt_set_memory_safe(dst, 0, dst_size, dst_size); + } + return -1; + } + auto s = reinterpret_cast(src); + auto d = reinterpret_cast(dst); + for (Size i = 0; i < len; ++i) + d[i] = s[i]; + return static_cast(len); +} + +STATIC voidPtr rt_set_memory_safe(voidPtr dst, UInt32 value, Size len, Size dst_size) { + if (!dst || len > dst_size) return nullptr; + auto p = reinterpret_cast(dst); + UInt8 v = static_cast(value & 0xFF); + for (Size i = 0; i < len; ++i) + p[i] = v; + return dst; +} + +Void rt_zero_memory(voidPtr pointer, Size len) { + rt_set_memory_safe(pointer, 0, len, len); +} + +#ifdef __NE_ENFORCE_DEPRECATED_WARNINGS +[[deprecated("Use rt_set_memory_safe instead")]] +#endif +voidPtr rt_set_memory(voidPtr src, UInt32 value, Size len) { + if (!src) return nullptr; + auto p = reinterpret_cast(src); + UInt8 v = static_cast(value & 0xFF); + for (Size i = 0; i < len; ++i) + p[i] = v; + return src; +} + +#ifdef __NE_ENFORCE_DEPRECATED_WARNINGS +[[deprecated("Use rt_copy_memory_safe instead")]] +#endif +Int rt_copy_memory(const voidPtr src, voidPtr dst, Size len) { + if (!src || !dst) return -1; + auto s = reinterpret_cast(src); + auto d = reinterpret_cast(dst); + + for (Size i = 0; i < len; ++i) + d[i] = s[i]; + + return static_cast(len); +} + + +Int32 rt_to_uppercase(Int32 ch) { + return (ch >= 'a' && ch <= 'z') ? ch - 0x20 : ch; +} + +Int32 rt_to_lower(Int32 ch) { + return (ch >= 'A' && ch <= 'Z') ? ch + 0x20 : ch; +} + +Int32 rt_is_alnum(Int32 ch) { + return (ch >= 'a' && ch <= 'z') || + (ch >= 'A' && ch <= 'Z') || + (ch >= '0' && ch <= '9'); +} + +Boolean rt_is_space(Char ch) { + return ch == ' '; +} + +Boolean rt_is_newln(Char ch) { + return ch == '\n'; +} + +Char rt_to_char(UInt64 value, Int32 base) { + static constexpr Char kDigits[] = "0123456789ABCDEF"; + return kDigits[value % base]; +} + +Bool rt_to_string(Char* str, UInt64 value, Int32 base) { +#ifdef __NE_AMD64__ + Int i = 0; + do { + str[i++] = rt_to_char(value, base); + value /= base; + } while (value); + str[i] = '\0'; + // in-place + for (Int j = 0; j < i / 2; ++j) { + Char tmp = str[j]; + str[j] = str[i - j - 1]; + str[i - j - 1] = tmp; + } +#endif + return true; +} + + +VoidPtr rt_string_in_string(const Char* haystack, const Char* needle) { + SizeT needle_len = rt_string_len(needle); + SizeT hay_len = rt_string_len(haystack); + + if (needle_len > hay_len) return nullptr; + for (SizeT i = 0; i <= hay_len - needle_len; ++i) { + if (rt_string_cmp(haystack + i, needle, needle_len) == 0) { + return reinterpret_cast(const_cast(haystack + i)); + } + } + return nullptr; +} + +Char* rt_string_has_char(Char* str, Char ch) { + while (*str && *str != ch) ++str; + return (*str == ch) ? str : nullptr; +} + +Int32 rt_strcmp(const Char* a, const Char* b) { + Size i = 0; + while (a[i] != '\0' && b[i] != '\0' && a[i] == b[i]) { + ++i; + } + return static_cast(static_cast(a[i]) - + static_cast(b[i])); +} + + // @uses the deprecated version callers should ensure 'len' is valid. +extern "C" void* memset(void* dst, int c, long long unsigned int len) { + return Kernel::rt_set_memory(dst, c, static_cast(len)); +} + +extern "C" void* memcpy(void* dst, const void* src, long long unsigned int len) { + Kernel::rt_copy_memory(const_cast(src), dst, static_cast(len)); + return dst; +} + +extern "C" Kernel::Int32 strcmp(const char* a, const char* b) { + return Kernel::rt_strcmp(a, b); +} + +} diff --git a/dev/kernel/src/ThreadLocalStorage.cc b/dev/kernel/src/ThreadLocalStorage.cc index ec315ddf..88fefee4 100644 --- a/dev/kernel/src/ThreadLocalStorage.cc +++ b/dev/kernel/src/ThreadLocalStorage.cc @@ -15,7 +15,7 @@ /***********************************************************************************/ /// @bugs: 0 /// @file ThreadLocalStorage.cc -/// @brief Process Thread Local Storage. +/// @brief NeKernel Thread Local Storage. /***********************************************************************************/ using namespace Kernel; @@ -27,15 +27,10 @@ using namespace Kernel; */ Boolean tls_check_tib(THREAD_INFORMATION_BLOCK* tib_ptr) { - if (!tib_ptr || !tib_ptr->Record) return false; + if (!tib_ptr) return false; - ICodec encoder; - const Char* tib_as_bytes = encoder.AsBytes(tib_ptr); - - kout << "TLS: Validating the TIB...\r"; - - return tib_as_bytes[kCookieMag0Idx] == kCookieMag0 && - tib_as_bytes[kCookieMag1Idx] == kCookieMag1 && tib_as_bytes[kCookieMag2Idx] == kCookieMag2; + return tib_ptr->Cookie[kCookieMag0Idx] == kCookieMag0 && + tib_ptr->Cookie[kCookieMag1Idx] == kCookieMag1 && tib_ptr->Cookie[kCookieMag2Idx] == kCookieMag2; } /** @@ -51,11 +46,5 @@ EXTERN_C Bool tls_check_syscall_impl(Kernel::VoidPtr tib_ptr) noexcept { THREAD_INFORMATION_BLOCK* tib = reinterpret_cast(tib_ptr); - if (!tls_check_tib(tib)) { - kout << "TLS: Failed because of an invalid TIB...\r"; - return No; - } - - kout << "TLS Pass.\r"; - return Yes; + return tls_check_tib(tib); } diff --git a/dev/kernel/src/Utils.cc b/dev/kernel/src/Utils.cc deleted file mode 100644 index 087b6d5f..00000000 --- a/dev/kernel/src/Utils.cc +++ /dev/null @@ -1,194 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. - -------------------------------------------- */ - -#include - -namespace Kernel { - -STATIC Int rt_copy_memory_safe(const voidPtr src, voidPtr dst, Size len, Size dst_size); -STATIC voidPtr rt_set_memory_safe(voidPtr dst, UInt32 value, Size len, Size dst_size); - -Int32 rt_string_cmp(const Char* src, const Char* cmp, Size size) { - for (Size i = 0; i < size; ++i) { - if (src[i] != cmp[i]) - return static_cast(src[i]) - static_cast(cmp[i]); - } - return 0; -} - -SizeT rt_string_len(const Char* str, SizeT max_len) { - SizeT len = 0; - while (len < max_len && str[len] != '\0') - ++len; - return len; -} - -Size rt_string_len(const Char* ptr) { - Size cnt = 0; - while (ptr[cnt] != '\0') - ++cnt; - return cnt; -} - -const Char* rt_alloc_string(const Char* src) { - SizeT slen = rt_string_len(src); - Char* buffer = new Char[slen + 1]; - if (!buffer) return nullptr; - - if (rt_copy_memory_safe(reinterpret_cast(const_cast(src)), - reinterpret_cast(buffer), - slen, - slen + 1) < 0) { - delete[] buffer; - return nullptr; - } - - buffer[slen] = '\0'; - return buffer; -} - -STATIC Int rt_copy_memory_safe(const voidPtr src, voidPtr dst, Size len, Size dst_size) { - if (!src || !dst || len > dst_size) { - if (dst && dst_size) { - rt_set_memory_safe(dst, 0, dst_size, dst_size); - } - return -1; - } - auto s = reinterpret_cast(src); - auto d = reinterpret_cast(dst); - for (Size i = 0; i < len; ++i) - d[i] = s[i]; - return static_cast(len); -} - -STATIC voidPtr rt_set_memory_safe(voidPtr dst, UInt32 value, Size len, Size dst_size) { - if (!dst || len > dst_size) return nullptr; - auto p = reinterpret_cast(dst); - UInt8 v = static_cast(value & 0xFF); - for (Size i = 0; i < len; ++i) - p[i] = v; - return dst; -} - -Void rt_zero_memory(voidPtr pointer, Size len) { - rt_set_memory_safe(pointer, 0, len, len); -} - -#ifdef __NE_ENFORCE_DEPRECATED_WARNINGS -[[deprecated("Use rt_set_memory_safe instead")]] -#endif -voidPtr rt_set_memory(voidPtr src, UInt32 value, Size len) { - if (!src) return nullptr; - auto p = reinterpret_cast(src); - UInt8 v = static_cast(value & 0xFF); - for (Size i = 0; i < len; ++i) - p[i] = v; - return src; -} - -#ifdef __NE_ENFORCE_DEPRECATED_WARNINGS -[[deprecated("Use rt_copy_memory_safe instead")]] -#endif -Int rt_copy_memory(const voidPtr src, voidPtr dst, Size len) { - if (!src || !dst) return -1; - auto s = reinterpret_cast(src); - auto d = reinterpret_cast(dst); - - for (Size i = 0; i < len; ++i) - d[i] = s[i]; - - return static_cast(len); -} - - -Int32 rt_to_uppercase(Int32 ch) { - return (ch >= 'a' && ch <= 'z') ? ch - 0x20 : ch; -} - -Int32 rt_to_lower(Int32 ch) { - return (ch >= 'A' && ch <= 'Z') ? ch + 0x20 : ch; -} - -Int32 rt_is_alnum(Int32 ch) { - return (ch >= 'a' && ch <= 'z') || - (ch >= 'A' && ch <= 'Z') || - (ch >= '0' && ch <= '9'); -} - -Boolean rt_is_space(Char ch) { - return ch == ' '; -} - -Boolean rt_is_newln(Char ch) { - return ch == '\n'; -} - -Char rt_to_char(UInt64 value, Int32 base) { - static constexpr Char kDigits[] = "0123456789ABCDEF"; - return kDigits[value % base]; -} - -Bool rt_to_string(Char* str, UInt64 value, Int32 base) { -#ifdef __NE_AMD64__ - Int i = 0; - do { - str[i++] = rt_to_char(value, base); - value /= base; - } while (value); - str[i] = '\0'; - // in-place - for (Int j = 0; j < i / 2; ++j) { - Char tmp = str[j]; - str[j] = str[i - j - 1]; - str[i - j - 1] = tmp; - } -#endif - return true; -} - - -VoidPtr rt_string_in_string(const Char* haystack, const Char* needle) { - SizeT needle_len = rt_string_len(needle); - SizeT hay_len = rt_string_len(haystack); - - if (needle_len > hay_len) return nullptr; - for (SizeT i = 0; i <= hay_len - needle_len; ++i) { - if (rt_string_cmp(haystack + i, needle, needle_len) == 0) { - return reinterpret_cast(const_cast(haystack + i)); - } - } - return nullptr; -} - -Char* rt_string_has_char(Char* str, Char ch) { - while (*str && *str != ch) ++str; - return (*str == ch) ? str : nullptr; -} - -Int32 rt_strcmp(const Char* a, const Char* b) { - Size i = 0; - while (a[i] != '\0' && b[i] != '\0' && a[i] == b[i]) { - ++i; - } - return static_cast(static_cast(a[i]) - - static_cast(b[i])); -} - - // @uses the deprecated version callers should ensure 'len' is valid. -extern "C" void* memset(void* dst, int c, long long unsigned int len) { - return Kernel::rt_set_memory(dst, c, static_cast(len)); -} - -extern "C" void* memcpy(void* dst, const void* src, long long unsigned int len) { - Kernel::rt_copy_memory(const_cast(src), dst, static_cast(len)); - return dst; -} - -extern "C" Kernel::Int32 strcmp(const char* a, const char* b) { - return Kernel::rt_strcmp(a, b); -} - -} diff --git a/dev/open_msg/script/window.msg b/dev/open_msg/script/window.msg deleted file mode 100644 index 77d6ef69..00000000 --- a/dev/open_msg/script/window.msg +++ /dev/null @@ -1,6 +0,0 @@ -(window - :id 1 - :pos (x 100 y 100) - :size (w 300 h 200) - :title "My App" - :on-click (lambda () (log "Clicked!"))) \ No newline at end of file diff --git a/dev/open_msg/script/window_client.json b/dev/open_msg/script/window_client.json new file mode 100644 index 00000000..4c8a21ba --- /dev/null +++ b/dev/open_msg/script/window_client.json @@ -0,0 +1,7 @@ +{ + "id": 1, + "pos": { "x": 100, "y": 100 }, + "size": { "w": 300, "h": 200 }, + "title": "Window Client", + "on-click": "_OnClickCSymbol" +} \ No newline at end of file -- cgit v1.2.3