Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Only load program headers of interpreter if its present

Browse Source 
I was loading program headers of both executable and interpreter but
that is incorrect. The interpreter will itself load the program headers
of the executable.
This commit is contained in:
Bananymous
2024-08-28 21:19:37 +03:00
parent 50ab391133
commit 8da2f12ba6
3 changed files with 205 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
userspace/libraries/LibELF/include/LibELF/LoadableELF.h
View File

@@ -25,10 +25,10 @@ namespace LibELF
static BAN::ErrorOr<BAN::UniqPtr<LoadableELF>> load_from_inode(Kernel::PageTable&, const Kernel::Credentials&, BAN::RefPtr<Kernel::Inode>);
~LoadableELF();
Kernel::vaddr_t entry_point() const;
Kernel::vaddr_t entry_point() const { return m_file_header.e_entry; }
bool has_interpreter() const { return !!m_interpreter.inode; }
BAN::RefPtr<Kernel::Inode> inode() { return m_executable.inode; }
bool has_interpreter() const { return !!m_interpreter; }
BAN::RefPtr<Kernel::Inode> executable() { return m_executable; }
bool contains(Kernel::vaddr_t address) const;
bool is_address_space_free() const;
@@ -44,30 +44,25 @@ namespace LibELF
size_t physical_page_count() const { return m_physical_page_count; }
private:
struct LoadableElfFile
{
BAN::RefPtr<Kernel::Inode> inode;
ElfNativeFileHeader file_header;
BAN::Vector<ElfNativeProgramHeader> program_headers;
Kernel::vaddr_t dynamic_base;
};
struct LoadResult
{
LoadableElfFile elf_file;
BAN::RefPtr<Kernel::Inode> inode;
BAN::RefPtr<Kernel::Inode> interp;
ElfNativeFileHeader file_header;
BAN::Vector<ElfNativeProgramHeader> program_headers;
};
private:
LoadableELF(Kernel::PageTable&);
BAN::ErrorOr<void> initialize(const Kernel::Credentials&, BAN::RefPtr<Kernel::Inode>);
bool does_executable_and_interpreter_overlap() const;
BAN::ErrorOr<LoadResult> load_elf_file(const Kernel::Credentials&, BAN::RefPtr<Kernel::Inode>) const;
private:
LoadableElfFile m_executable;
LoadableElfFile m_interpreter;
BAN::RefPtr<Kernel::Inode> m_executable;
BAN::RefPtr<Kernel::Inode> m_interpreter;
ElfNativeFileHeader m_file_header;
BAN::Vector<ElfNativeProgramHeader> m_program_headers;
Kernel::PageTable& m_page_table;
size_t m_virtual_page_count { 0 };
size_t m_physical_page_count { 0 };