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

Kernel: Start exec by loading the ELF file. It might not exist...

This commit is contained in:
Bananymous 2024-01-03 23:47:39 +02:00
parent ccaa159a73
commit 0ba278041b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ namespace Kernel
BAN::ErrorOr<long> sys_settermios(const ::termios*); BAN::ErrorOr<long> sys_settermios(const ::termios*);
BAN::ErrorOr<long> sys_fork(uintptr_t rsp, uintptr_t rip); BAN::ErrorOr<long> sys_fork(uintptr_t rsp, uintptr_t rip);
BAN::ErrorOr<long> sys_exec(BAN::StringView path, const char* const* argv, const char* const* envp); BAN::ErrorOr<long> sys_exec(const char* path, const char* const* argv, const char* const* envp);
BAN::ErrorOr<long> sys_wait(pid_t pid, int* stat_loc, int options); BAN::ErrorOr<long> sys_wait(pid_t pid, int* stat_loc, int options);
BAN::ErrorOr<long> sys_sleep(int seconds); BAN::ErrorOr<long> sys_sleep(int seconds);

10
kernel/kernel/Process.cpp
View File

@ -439,12 +439,15 @@ namespace Kernel
return forked->pid(); return forked->pid();
} }
BAN::ErrorOr<long> Process::sys_exec(BAN::StringView path, const char* const* argv, const char* const* envp) BAN::ErrorOr<long> Process::sys_exec(const char* path, const char* const* argv, const char* const* envp)
{ {
// NOTE: We scope everything for automatic deletion // NOTE: We scope everything for automatic deletion
{ {
LockGuard _(m_lock); LockGuard _(m_lock);
validate_string_access(path);
auto loadable_elf = TRY(load_elf_for_exec(m_credentials, path, m_working_directory, page_table()));
BAN::Vector<BAN::String> str_argv; BAN::Vector<BAN::String> str_argv;
for (int i = 0; argv && argv[i]; i++) for (int i = 0; argv && argv[i]; i++)
{ {
@ -467,13 +470,14 @@ namespace Kernel
m_open_file_descriptors.close_cloexec(); m_open_file_descriptors.close_cloexec();
m_mapped_regions.clear(); m_mapped_regions.clear();
m_loadable_elf.clear();
m_loadable_elf = TRY(load_elf_for_exec(m_credentials, executable_path, m_working_directory, page_table())); m_loadable_elf = BAN::move(loadable_elf);
if (!m_loadable_elf->is_address_space_free()) if (!m_loadable_elf->is_address_space_free())
{ {
dprintln("ELF has unloadable address space"); dprintln("ELF has unloadable address space");
MUST(sys_kill(pid(), SIGKILL)); MUST(sys_kill(pid(), SIGKILL));
// NOTE: signal will only execute after return from syscall
return BAN::Error::from_errno(EINTR);
} }
m_loadable_elf->reserve_address_space(); m_loadable_elf->reserve_address_space();
m_loadable_elf->update_suid_sgid(m_credentials); m_loadable_elf->update_suid_sgid(m_credentials);