[orbis-kernel] Improve kdelete safety

RPCSX · Jul 15, 2023 · 191a945 · 191a945
1 parent 9717128
commit 191a945
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/orbis-kernel/include/orbis/KernelAllocator.hpp b/orbis-kernel/include/orbis/KernelAllocator.hpp
@@ -54,9 +54,16 @@ template <typename T, typename... Args> T *knew(Args &&...args) {
   return res;
 }
 
+// clang-format off
 template <typename T> void kdelete(T *ptr) {
+  auto total_size = sizeof(T);
+  if constexpr (requires(T *t) { t->_total_size = sizeof(T); })
+    total_size = ptr->_total_size;
+  else
+    static_assert(std::is_final_v<T>, "Uncertain type size");
   ptr->~T();
-  utils::kfree(ptr, sizeof(T));
+  utils::kfree(ptr, total_size);
 }
+// clang-format on
 
 } // namespace orbis
diff --git a/orbis-kernel/include/orbis/evf.hpp b/orbis-kernel/include/orbis/evf.hpp
@@ -21,7 +21,7 @@ enum {
   kEvfWaitModeClearPat = 0x20,
 };
 
-struct EventFlag {
+struct EventFlag final {
   char name[32];
 
   bool isDeleted = false;

diff --git a/orbis-kernel/include/orbis/file.hpp b/orbis-kernel/include/orbis/file.hpp
@@ -40,7 +40,7 @@ struct FileOps {
                       Thread *thread) = nullptr;
 };
 
-struct File {
+struct File final {
   FileOps *ops;
   Ref<RcBase> device;
   std::atomic<unsigned> refs{0};

diff --git a/orbis-kernel/include/orbis/thread/Process.hpp b/orbis-kernel/include/orbis/thread/Process.hpp
@@ -22,7 +22,7 @@ struct NamedObjInfo {
   uint16_t ty;
 };
 
-struct Process {
+struct Process final {
   KernelContext *context = nullptr;
   pid_t pid = -1;
   sysentvec *sysent = nullptr;

diff --git a/orbis-kernel/include/orbis/utils/LinkedNode.hpp b/orbis-kernel/include/orbis/utils/LinkedNode.hpp
@@ -2,7 +2,7 @@
 
 namespace orbis {
 inline namespace utils {
-template <typename T> struct LinkedNode {
+template <typename T> struct LinkedNode final {
   T object;
   LinkedNode *next = nullptr;
   LinkedNode *prev = nullptr;