diff options
| author | Liav A <liavalb@gmail.com> | 2023-02-24 19:34:21 +0200 |
|---|---|---|
| committer | Jelle Raaijmakers <jelle@gmta.nl> | 2023-06-04 21:32:34 +0200 |
| commit | 788022d5d16147b7d149294f9783cb2b0022021f (patch) | |
| tree | 2ab7226f0654fe12a5ebbb1fb49fc83124c41caa | |
| parent | fd9dbf1f201d960deca436f5b8f2fac462358a1c (diff) | |
| download | serenity-788022d5d16147b7d149294f9783cb2b0022021f.zip | |
Kernel: Move Jail code to a new subdirectory
| -rw-r--r-- | Kernel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Kernel/FileSystem/SysFS/Subsystems/Kernel/Jails.cpp | 2 | ||||
| -rw-r--r-- | Kernel/Process.h | 2 | ||||
| -rw-r--r-- | Kernel/Security/Jail.cpp (renamed from Kernel/Jail.cpp) | 2 | ||||
| -rw-r--r-- | Kernel/Security/Jail.h (renamed from Kernel/Jail.h) | 0 | ||||
| -rw-r--r-- | Kernel/Syscalls/jail.cpp | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 059cdba19d..ad49556bb5 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -119,7 +119,6 @@ set(KERNEL_SOURCES Graphics/VirtIOGPU/GPU3DDevice.cpp Graphics/VirtIOGPU/GraphicsAdapter.cpp IOWindow.cpp - Jail.cpp SanCov.cpp DoubleBuffer.cpp FileSystem/AnonymousFile.cpp @@ -270,6 +269,7 @@ set(KERNEL_SOURCES ScopedCritical.cpp StdLib.cpp Syscall.cpp + Security/Jail.cpp Syscalls/anon_create.cpp Syscalls/alarm.cpp Syscalls/beep.cpp diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Jails.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Jails.cpp index eedf783f2c..61ce06c60c 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Jails.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Jails.cpp @@ -6,8 +6,8 @@ #include <AK/JsonObjectSerializer.h> #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Jails.h> -#include <Kernel/Jail.h> #include <Kernel/Sections.h> +#include <Kernel/Security/Jail.h> namespace Kernel { diff --git a/Kernel/Process.h b/Kernel/Process.h index 0d3053a30d..3bb324d3b0 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -25,7 +25,6 @@ #include <Kernel/FileSystem/UnveilNode.h> #include <Kernel/Forward.h> #include <Kernel/FutexQueue.h> -#include <Kernel/Jail.h> #include <Kernel/Library/LockWeakPtr.h> #include <Kernel/Library/LockWeakable.h> #include <Kernel/Locking/Mutex.h> @@ -33,6 +32,7 @@ #include <Kernel/Memory/AddressSpace.h> #include <Kernel/PerformanceEventBuffer.h> #include <Kernel/ProcessGroup.h> +#include <Kernel/Security/Jail.h> #include <Kernel/StdLib.h> #include <Kernel/Thread.h> #include <Kernel/UnixTypes.h> diff --git a/Kernel/Jail.cpp b/Kernel/Security/Jail.cpp index e364b21b13..78f546d29e 100644 --- a/Kernel/Jail.cpp +++ b/Kernel/Security/Jail.cpp @@ -7,8 +7,8 @@ #include <AK/IntrusiveList.h> #include <AK/Singleton.h> #include <Kernel/API/Jail.h> -#include <Kernel/Jail.h> #include <Kernel/Process.h> +#include <Kernel/Security/Jail.h> namespace Kernel { diff --git a/Kernel/Jail.h b/Kernel/Security/Jail.h index 72817db310..72817db310 100644 --- a/Kernel/Jail.h +++ b/Kernel/Security/Jail.h diff --git a/Kernel/Syscalls/jail.cpp b/Kernel/Syscalls/jail.cpp index 8c6dd44351..d27fcb1672 100644 --- a/Kernel/Syscalls/jail.cpp +++ b/Kernel/Syscalls/jail.cpp @@ -6,8 +6,8 @@ #include <AK/Userspace.h> #include <Kernel/API/Jail.h> -#include <Kernel/Jail.h> #include <Kernel/Process.h> +#include <Kernel/Security/Jail.h> #include <Kernel/StdLib.h> namespace Kernel { |