apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

Bugfix: remove duplicate error check when loading a userspace ELF program

Browse Source 
Also, remember to delete the allocated task, since we do not want memory leaks :)
This commit is contained in:
apio 2022-10-08 13:12:19 +00:00
parent 159d025d9f
commit 309058888c
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/src/thread/Scheduler.cpp
View File

@ -121,16 +121,11 @@ void Scheduler::load_user_task(const char* filename)
if (!image) if (!image)
{ {
kerrorln("Failed to load %s from initrd", filename); kerrorln("Failed to load %s from initrd", filename);
delete new_task;
return; return;
} }
new_task->regs.rip = image->entry; new_task->regs.rip = image->entry;
new_task->image = image; new_task->image = image;
if (!new_task->regs.rip)
{
kwarnln("Failed to load user task %s", filename);
delete new_task;
return;
}
new_task->allocated_stack = (uint64_t)MemoryManager::get_pages( new_task->allocated_stack = (uint64_t)MemoryManager::get_pages(
TASK_PAGES_IN_STACK, MAP_READ_WRITE | MAP_USER); // 16 KB is enough for everyone, right? TASK_PAGES_IN_STACK, MAP_READ_WRITE | MAP_USER); // 16 KB is enough for everyone, right?
new_task->regs.rsp = new_task->allocated_stack + (PAGE_SIZE * TASK_PAGES_IN_STACK) - sizeof(uintptr_t); new_task->regs.rsp = new_task->allocated_stack + (PAGE_SIZE * TASK_PAGES_IN_STACK) - sizeof(uintptr_t);