Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

Kernel: exec now has better posix errors

This commit is contained in:
Bananymous 2023-06-05 21:08:34 +03:00
parent 3fc2c3529a
commit 0b1b4d8f7e
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/include/kernel/Process.h
View File

@ -49,6 +49,8 @@ namespace Kernel
pid_t pid() const { return m_pid; } pid_t pid() const { return m_pid; }
static BAN::ErrorOr<LibELF::ELF*> load_elf_for_exec(BAN::StringView);
BAN::ErrorOr<Process*> fork(uintptr_t rsp, uintptr_t rip); BAN::ErrorOr<Process*> fork(uintptr_t rsp, uintptr_t rip);
BAN::ErrorOr<void> exec(BAN::StringView path, const char* const* argv, const char* const* envp); BAN::ErrorOr<void> exec(BAN::StringView path, const char* const* argv, const char* const* envp);

56
kernel/kernel/Process.cpp
View File

@ -46,19 +46,7 @@ namespace Kernel
BAN::ErrorOr<Process*> Process::create_userspace(BAN::StringView path) BAN::ErrorOr<Process*> Process::create_userspace(BAN::StringView path)
{ {
auto* elf = TRY(LibELF::ELF::load_from_file(path)); auto* elf = TRY(load_elf_for_exec(path));
if (!elf->is_native())
{
derrorln("ELF has invalid architecture");
delete elf;
return BAN::Error::from_errno(EINVAL);
}
if (elf->file_header_native().e_type != LibELF::ET_EXEC)
{
derrorln("Not an executable");
delete elf;
return BAN::Error::from_errno(EINVAL);
}
auto* process = create_process(); auto* process = create_process();
MUST(process->m_working_directory.push_back('/')); MUST(process->m_working_directory.push_back('/'));
@ -167,6 +155,34 @@ namespace Kernel
return {}; return {};
} }
BAN::ErrorOr<LibELF::ELF*> Process::load_elf_for_exec(BAN::StringView path)
{
auto elf_or_error = LibELF::ELF::load_from_file(path);
if (elf_or_error.is_error())
{
if (elf_or_error.error().get_error_code() == EINVAL)
return BAN::Error::from_errno(ENOEXEC);
return elf_or_error.error();
}
auto* elf = elf_or_error.release_value();
if (!elf->is_native())
{
derrorln("ELF has invalid architecture");
delete elf;
return BAN::Error::from_errno(EINVAL);
}
if (elf->file_header_native().e_type != LibELF::ET_EXEC)
{
derrorln("Not an executable");
delete elf;
return BAN::Error::from_errno(ENOEXEC);
}
return elf;
}
BAN::ErrorOr<Process*> Process::fork(uintptr_t rsp, uintptr_t rip) BAN::ErrorOr<Process*> Process::fork(uintptr_t rsp, uintptr_t rip)
{ {
Process* forked = create_process(); Process* forked = create_process();
@ -212,19 +228,7 @@ namespace Kernel
if (str_envp.emplace_back(*envp++).is_error()) if (str_envp.emplace_back(*envp++).is_error())
return BAN::Error::from_errno(ENOMEM); return BAN::Error::from_errno(ENOMEM);
auto* elf = TRY(LibELF::ELF::load_from_file(path)); auto* elf = TRY(load_elf_for_exec(path));
if (!elf->is_native())
{
derrorln("ELF has invalid architecture");
delete elf;
return BAN::Error::from_errno(EINVAL);
}
if (elf->file_header_native().e_type != LibELF::ET_EXEC)
{
derrorln("Not an executable");
delete elf;
return BAN::Error::from_errno(EINVAL);
}
LockGuard lock_guard(m_lock); LockGuard lock_guard(m_lock);