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

Fixed race condition

Browse Source
This commit is contained in:
Alex 2023-02-19 00:24:14 +02:00
parent 84ed8d61e2
commit 858a67c047
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
KThread.cpp
View File

@ -178,10 +178,6 @@ void KernelMainThread()
Execute::SpawnData ret = {Execute::ExStatus::Unknown, nullptr, nullptr}; Execute::SpawnData ret = {Execute::ExStatus::Unknown, nullptr, nullptr};
Tasking::TCB *ExecuteThread = nullptr; Tasking::TCB *ExecuteThread = nullptr;
int ExitCode = -1; int ExitCode = -1;
Display->Print('.', 0);
Display->SetBuffer(0);
ExecuteThread = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)Execute::StartExecuteService); ExecuteThread = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)Execute::StartExecuteService);
ExecuteThread->Rename("Library Manager"); ExecuteThread->Rename("Library Manager");
ExecuteThread->SetCritical(true); ExecuteThread->SetCritical(true);
@ -190,10 +186,12 @@ void KernelMainThread()
Display->Print('.', 0); Display->Print('.', 0);
Display->SetBuffer(0); Display->SetBuffer(0);
/* Prevent race conditions */
CPU::Interrupts(CPU::Disable);
ret = SpawnInit(); ret = SpawnInit();
Display->Print('.', 0); Display->Print('.', 0);
Display->Print('\n', 0);
Display->SetBuffer(0); Display->SetBuffer(0);
if (ret.Status != Execute::ExStatus::OK) if (ret.Status != Execute::ExStatus::OK)
@ -204,6 +202,14 @@ void KernelMainThread()
TaskManager->GetSecurityManager()->TrustToken(ret.Process->Security.UniqueToken, Tasking::TTL::FullTrust); TaskManager->GetSecurityManager()->TrustToken(ret.Process->Security.UniqueToken, Tasking::TTL::FullTrust);
TaskManager->GetSecurityManager()->TrustToken(ret.Thread->Security.UniqueToken, Tasking::TTL::FullTrust); TaskManager->GetSecurityManager()->TrustToken(ret.Thread->Security.UniqueToken, Tasking::TTL::FullTrust);
ret.Thread->SetCritical(true); ret.Thread->SetCritical(true);
Display->Print('.', 0);
Display->Print('\n', 0);
Display->SetBuffer(0);
/* Prevent the init process to execute syscalls without being trusted by the kernel */
CPU::Interrupts(CPU::Enable);
KPrint("Waiting for \e22AAFF%s\eCCCCCC to start...", Config.InitPath); KPrint("Waiting for \e22AAFF%s\eCCCCCC to start...", Config.InitPath);
TaskManager->GetCurrentThread()->SetPriority(Tasking::Idle); TaskManager->GetCurrentThread()->SetPriority(Tasking::Idle);
TaskManager->WaitForThread(ret.Thread); TaskManager->WaitForThread(ret.Thread);