diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 0b1f445aae..d99a55ec6e 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -16,7 +16,6 @@ set(KERNEL_HEAP_SOURCES ) set(KERNEL_SOURCES - AddressSanitizer.cpp Arch/init.cpp Arch/PageFault.cpp Arch/DeferredCallPool.cpp @@ -263,8 +262,10 @@ set(KERNEL_SOURCES ScopedCritical.cpp StdLib.cpp Syscall.cpp + Security/AddressSanitizer.cpp Security/Random.cpp Security/Jail.cpp + Security/UBSanitizer.cpp Syscalls/anon_create.cpp Syscalls/alarm.cpp Syscalls/beep.cpp @@ -357,7 +358,6 @@ set(KERNEL_SOURCES Tasks/WorkQueue.cpp Time/TimeManagement.cpp TimerQueue.cpp - UBSanitizer.cpp UserOrKernelBuffer.cpp ) diff --git a/Kernel/AddressSanitizer.cpp b/Kernel/Security/AddressSanitizer.cpp similarity index 98% rename from Kernel/AddressSanitizer.cpp rename to Kernel/Security/AddressSanitizer.cpp index f1bc6f0d90..2b2a2ec1d0 100644 --- a/Kernel/AddressSanitizer.cpp +++ b/Kernel/Security/AddressSanitizer.cpp @@ -6,7 +6,7 @@ #if defined(__SANITIZE_ADDRESS__) -# include +# include void Kernel::AddressSanitizer::shadow_va_check_load(unsigned long address, size_t size, void* return_address) { diff --git a/Kernel/AddressSanitizer.h b/Kernel/Security/AddressSanitizer.h similarity index 100% rename from Kernel/AddressSanitizer.h rename to Kernel/Security/AddressSanitizer.h diff --git a/Kernel/UBSanitizer.cpp b/Kernel/Security/UBSanitizer.cpp similarity index 100% rename from Kernel/UBSanitizer.cpp rename to Kernel/Security/UBSanitizer.cpp