Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved SyscallsLock

Browse Source
This commit is contained in:
Alex 2023-02-10 05:45:30 +02:00
parent 5ab15645ca
commit 742082f755
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
2 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
SystemCalls/Native.cpp
View File

@ -10,8 +10,6 @@
#include "../../Userspace/libs/include/sysbase.h" #include "../../Userspace/libs/include/sysbase.h"
#include "../ipc.h" #include "../ipc.h"
NewLock(SyscallsLock);
using InterProcessCommunication::IPC; using InterProcessCommunication::IPC;
using InterProcessCommunication::IPCID; using InterProcessCommunication::IPCID;
using Tasking::Token; using Tasking::Token;
@ -36,7 +34,6 @@ static inline bool CheckTrust(int TrustLevel)
static int sys_exit(SyscallsFrame *Frame, int code) static int sys_exit(SyscallsFrame *Frame, int code)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
/* Allow everyone to exit */ /* Allow everyone to exit */
if (!CheckTrust(TrustedByKernel | Trusted | Untrusted | UnknownTrustLevel)) if (!CheckTrust(TrustedByKernel | Trusted | Untrusted | UnknownTrustLevel))
return SYSCALL_ACCESS_DENIED; return SYSCALL_ACCESS_DENIED;
@ -50,7 +47,6 @@ static int sys_exit(SyscallsFrame *Frame, int code)
static int sys_print(SyscallsFrame *Frame, char Char, int Index) static int sys_print(SyscallsFrame *Frame, char Char, int Index)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
/* Only trusted threads can write to the kernel console */ /* Only trusted threads can write to the kernel console */
if (!CheckTrust(TrustedByKernel | Trusted)) if (!CheckTrust(TrustedByKernel | Trusted))
return SYSCALL_ACCESS_DENIED; return SYSCALL_ACCESS_DENIED;
@ -65,7 +61,6 @@ static int sys_print(SyscallsFrame *Frame, char Char, int Index)
static uintptr_t sys_request_pages(SyscallsFrame *Frame, size_t Count) static uintptr_t sys_request_pages(SyscallsFrame *Frame, size_t Count)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
/* Allow everyone to request pages */ /* Allow everyone to request pages */
if (!CheckTrust(TrustedByKernel | Trusted | Untrusted)) if (!CheckTrust(TrustedByKernel | Trusted | Untrusted))
return SYSCALL_ACCESS_DENIED; return SYSCALL_ACCESS_DENIED;
@ -75,7 +70,6 @@ static uintptr_t sys_request_pages(SyscallsFrame *Frame, size_t Count)
static int sys_free_pages(SyscallsFrame *Frame, uintptr_t Address, size_t Count) static int sys_free_pages(SyscallsFrame *Frame, uintptr_t Address, size_t Count)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
/* Allow everyone to free pages */ /* Allow everyone to free pages */
if (!CheckTrust(TrustedByKernel | Trusted | Untrusted)) if (!CheckTrust(TrustedByKernel | Trusted | Untrusted))
return SYSCALL_ACCESS_DENIED; return SYSCALL_ACCESS_DENIED;
@ -86,7 +80,6 @@ static int sys_free_pages(SyscallsFrame *Frame, uintptr_t Address, size_t Count)
static int sys_detach_address(SyscallsFrame *Frame, uintptr_t Address) static int sys_detach_address(SyscallsFrame *Frame, uintptr_t Address)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
/* Only trusted threads can detach allocated addresses */ /* Only trusted threads can detach allocated addresses */
if (!CheckTrust(TrustedByKernel | Trusted)) if (!CheckTrust(TrustedByKernel | Trusted))
return SYSCALL_ACCESS_DENIED; return SYSCALL_ACCESS_DENIED;
@ -97,7 +90,6 @@ static int sys_detach_address(SyscallsFrame *Frame, uintptr_t Address)
static uintptr_t sys_kernelctl(SyscallsFrame *Frame, enum KCtl Command, uint64_t Arg1, uint64_t Arg2, uint64_t Arg3, uint64_t Arg4) static uintptr_t sys_kernelctl(SyscallsFrame *Frame, enum KCtl Command, uint64_t Arg1, uint64_t Arg2, uint64_t Arg3, uint64_t Arg4)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
/* Only trusted threads can use kernelctl */ /* Only trusted threads can use kernelctl */
if (!CheckTrust(TrustedByKernel | Trusted)) if (!CheckTrust(TrustedByKernel | Trusted))
return SYSCALL_ACCESS_DENIED; return SYSCALL_ACCESS_DENIED;
@ -126,7 +118,6 @@ static uintptr_t sys_kernelctl(SyscallsFrame *Frame, enum KCtl Command, uint64_t
static int sys_ipc(SyscallsFrame *Frame, enum IPCCommand Command, enum IPCType Type, int ID, int Flags, void *Buffer, size_t Size) static int sys_ipc(SyscallsFrame *Frame, enum IPCCommand Command, enum IPCType Type, int ID, int Flags, void *Buffer, size_t Size)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
/* Allow everyone to use IPC */ /* Allow everyone to use IPC */
if (!CheckTrust(TrustedByKernel | Trusted | Untrusted)) if (!CheckTrust(TrustedByKernel | Trusted | Untrusted))
return SYSCALL_ACCESS_DENIED; return SYSCALL_ACCESS_DENIED;
@ -136,133 +127,114 @@ static int sys_ipc(SyscallsFrame *Frame, enum IPCCommand Command, enum IPCType T
static int sys_file_open(SyscallsFrame *Frame) static int sys_file_open(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_file_open: %#lx", Frame); fixme("sys_file_open: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_file_close(SyscallsFrame *Frame) static int sys_file_close(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_file_close: %#lx", Frame); fixme("sys_file_close: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_file_read(SyscallsFrame *Frame) static int sys_file_read(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_file_read: %#lx", Frame); fixme("sys_file_read: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_file_write(SyscallsFrame *Frame) static int sys_file_write(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_file_write: %#lx", Frame); fixme("sys_file_write: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_file_seek(SyscallsFrame *Frame) static int sys_file_seek(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_file_seek: %#lx", Frame); fixme("sys_file_seek: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_file_status(SyscallsFrame *Frame) static int sys_file_status(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_file_status: %#lx", Frame); fixme("sys_file_status: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_wait(SyscallsFrame *Frame) static int sys_wait(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_wait: %#lx", Frame); fixme("sys_wait: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_kill(SyscallsFrame *Frame) static int sys_kill(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_kill: %#lx", Frame); fixme("sys_kill: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_spawn(SyscallsFrame *Frame) static int sys_spawn(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_spawn: %#lx", Frame); fixme("sys_spawn: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_spawn_thread(SyscallsFrame *Frame) static int sys_spawn_thread(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_spawn_thread: %#lx", Frame); fixme("sys_spawn_thread: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_get_thread_list_of_process(SyscallsFrame *Frame) static int sys_get_thread_list_of_process(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_get_thread_list_of_process: %#lx", Frame); fixme("sys_get_thread_list_of_process: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_get_current_process(SyscallsFrame *Frame) static int sys_get_current_process(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_get_current_process: %#lx", Frame); fixme("sys_get_current_process: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_get_current_thread(SyscallsFrame *Frame) static int sys_get_current_thread(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_get_current_thread: %#lx", Frame); fixme("sys_get_current_thread: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_get_process_by_pid(SyscallsFrame *Frame) static int sys_get_process_by_pid(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_get_process_by_pid: %#lx", Frame); fixme("sys_get_process_by_pid: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_get_thread_by_tid(SyscallsFrame *Frame) static int sys_get_thread_by_tid(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_get_thread_by_tid: %#lx", Frame); fixme("sys_get_thread_by_tid: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_kill_process(SyscallsFrame *Frame) static int sys_kill_process(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_kill_process: %#lx", Frame); fixme("sys_kill_process: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_kill_thread(SyscallsFrame *Frame) static int sys_kill_thread(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_kill_thread: %#lx", Frame); fixme("sys_kill_thread: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_sys_reserved_create_process(SyscallsFrame *Frame) static int sys_sys_reserved_create_process(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_sys_reserved_create_process: %#lx", Frame); fixme("sys_sys_reserved_create_process: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }
static int sys_sys_reserved_create_thread(SyscallsFrame *Frame) static int sys_sys_reserved_create_thread(SyscallsFrame *Frame)
{ {
SmartTimeoutLock(SyscallsLock, 10000);
fixme("sys_sys_reserved_create_thread: %#lx", Frame); fixme("sys_sys_reserved_create_thread: %#lx", Frame);
return SYSCALL_NOT_IMPLEMENTED; return SYSCALL_NOT_IMPLEMENTED;
} }

5
SystemCalls/Syscalls.cpp
View File

@ -4,8 +4,13 @@
#include "../kernel.h" #include "../kernel.h"
NewLock(SyscallsLock);
extern "C" uintptr_t SystemCallsHandler(SyscallsFrame *Frame) extern "C" uintptr_t SystemCallsHandler(SyscallsFrame *Frame)
{ {
CPU::Interrupts(CPU::Enable);
SmartLock(SyscallsLock); /* TODO: This should be replaced or moved somewhere else. */
#if defined(__amd64__) #if defined(__amd64__)
switch (TaskManager->GetCurrentThread()->Info.Compatibility) switch (TaskManager->GetCurrentThread()->Info.Compatibility)
{ {