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

Kernel: Pass interpreter base address in auxiliary vector

Browse Source
This commit is contained in:
Bananymous
2026-06-26 01:51:21 +03:00
parent fc1a6cacdc
commit 9919cbf66e
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,8 +14,8 @@ namespace Kernel::ELF
size_t size; size_t size;
}; };
bool open_execfd;
vaddr_t entry_point; vaddr_t entry_point;
BAN::Optional<vaddr_t> interp_base;
BAN::Optional<TLS> master_tls; BAN::Optional<TLS> master_tls;
BAN::Vector<BAN::UniqPtr<MemoryRegion>> regions; BAN::Vector<BAN::UniqPtr<MemoryRegion>> regions;
}; };

4
kernel/kernel/ELF.cpp
View File

@@ -291,7 +291,9 @@ namespace Kernel::ELF
TRY(memory_regions.emplace_back(BAN::move(region))); TRY(memory_regions.emplace_back(BAN::move(region)));
} }
result.open_execfd = !interpreter.empty(); if (!interpreter.empty())
result.interp_base = load_base_vaddr;
result.entry_point = load_base_vaddr + file_header.e_entry; result.entry_point = load_base_vaddr + file_header.e_entry;
result.regions = BAN::move(memory_regions); result.regions = BAN::move(memory_regions);
return BAN::move(result); return BAN::move(result);

16
kernel/kernel/Process.cpp
View File

@@ -144,15 +144,19 @@ namespace Kernel
process->m_credentials.set_egid(executable_inode->gid()); process->m_credentials.set_egid(executable_inode->gid());
BAN::Vector<LibELF::AuxiliaryVector> auxiliary_vector; BAN::Vector<LibELF::AuxiliaryVector> auxiliary_vector;
TRY(auxiliary_vector.reserve(1 + executable.open_execfd)); TRY(auxiliary_vector.reserve(2 + 2 * executable.interp_base.has_value()));
if (executable.open_execfd) if (executable.interp_base.has_value())
{ {
const int execfd = TRY(process->m_open_file_descriptors.open(BAN::move(executable_file), O_RDONLY)); const int execfd = TRY(process->m_open_file_descriptors.open(BAN::move(executable_file), O_RDONLY));
TRY(auxiliary_vector.push_back({ TRY(auxiliary_vector.push_back({
.a_type = LibELF::AT_EXECFD, .a_type = LibELF::AT_EXECFD,
.a_un = { .a_val = static_cast<uint32_t>(execfd) }, .a_un = { .a_val = static_cast<uint32_t>(execfd) },
})); }));
TRY(auxiliary_vector.push_back({
.a_type = LibELF::AT_BASE,
.a_un = { .a_ptr = reinterpret_cast<void*>(executable.interp_base.value()) },
}));
} }
process->m_shared_page_vaddr = process->page_table().reserve_free_page(process->m_mapped_regions.back()->vaddr(), USERSPACE_END); process->m_shared_page_vaddr = process->page_table().reserve_free_page(process->m_mapped_regions.back()->vaddr(), USERSPACE_END);
@@ -821,7 +825,7 @@ namespace Kernel
TRY(executable_path.append(executable_file.canonical_path)); TRY(executable_path.append(executable_file.canonical_path));
BAN::Vector<LibELF::AuxiliaryVector> auxiliary_vector; BAN::Vector<LibELF::AuxiliaryVector> auxiliary_vector;
TRY(auxiliary_vector.reserve(1 + executable.open_execfd)); TRY(auxiliary_vector.reserve(2 + 2 * executable.interp_base.has_value()));
BAN::ScopeGuard execfd_guard([this, &auxiliary_vector] { BAN::ScopeGuard execfd_guard([this, &auxiliary_vector] {
if (auxiliary_vector.empty()) if (auxiliary_vector.empty())
@@ -831,13 +835,17 @@ namespace Kernel
MUST(m_open_file_descriptors.close(auxiliary_vector.front().a_un.a_val)); MUST(m_open_file_descriptors.close(auxiliary_vector.front().a_un.a_val));
}); });
if (executable.open_execfd) if (executable.interp_base.has_value())
{ {
const int execfd = TRY(m_open_file_descriptors.open(BAN::move(executable_file), O_RDONLY)); const int execfd = TRY(m_open_file_descriptors.open(BAN::move(executable_file), O_RDONLY));
TRY(auxiliary_vector.push_back({ TRY(auxiliary_vector.push_back({
.a_type = LibELF::AT_EXECFD, .a_type = LibELF::AT_EXECFD,
.a_un = { .a_val = static_cast<uint32_t>(execfd) }, .a_un = { .a_val = static_cast<uint32_t>(execfd) },
})); }));
TRY(auxiliary_vector.push_back({
.a_type = LibELF::AT_BASE,
.a_un = { .a_ptr = reinterpret_cast<void*>(executable.interp_base.value()) },
}));
} }
const vaddr_t shared_page_vaddr = new_page_table->reserve_free_page(new_mapped_regions.back()->vaddr(), USERSPACE_END); const vaddr_t shared_page_vaddr = new_page_table->reserve_free_page(new_mapped_regions.back()->vaddr(), USERSPACE_END);

2
userspace/libraries/LibELF/include/LibELF/AuxiliaryVector.h
View File

@@ -23,6 +23,8 @@ namespace LibELF
AT_PHDR = 3, AT_PHDR = 3,
AT_PHENT = 4, AT_PHENT = 4,
AT_PHNUM = 5, AT_PHNUM = 5,
AT_PAGESZ = 6,
AT_BASE = 7,
AT_SHARED_PAGE = 0xFFFF0001, AT_SHARED_PAGE = 0xFFFF0001,
}; };