RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:17:36 +00:00
Code Issues Activity Actions

LibELF: Name non-executable map regions ".rodata" instead of ".text"

Browse source
This commit is contained in:
Andreas Kling 2021-09-04 20:01:58 +02:00
parent 769f777098
commit b7ee0191ea
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibELF/DynamicLoader.cpp
View file

@ -322,6 +322,13 @@ void DynamicLoader::load_program_headers()
FlatPtr ph_base = region.desired_load_address().page_base().get();
FlatPtr ph_end = ph_base + round_up_to_power_of_two(region.size_in_memory() + region.desired_load_address().get() - ph_base, PAGE_SIZE);
StringBuilder builder;
builder.append(m_filename);
if (region.is_executable())
builder.append(": .text");
else
builder.append(": .rodata");
// Now we can map the text segment at the reserved address.
auto* segment_base = (u8*)mmap_with_name(
(u8*)reservation + ph_base - ph_load_base,
@ -330,7 +337,7 @@ void DynamicLoader::load_program_headers()
MAP_FILE | MAP_SHARED | MAP_FIXED,
m_image_fd,
VirtualAddress { region.offset() }.page_base().get(),
String::formatted("{}: .text", m_filename).characters());
builder.to_string().characters());
if (segment_base == MAP_FAILED) {
perror("mmap non-writable");