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

LibELF+LibC: Add support for relative relocations in aarch64 binaries

Browse source 
This commit adds R_AARCH64_RELATIVE to elf.h and uses it in
ELF::perform_relative_relocations to correctly verify the relocation
type. This is the only change needed to support relative relocations for
aarch64.
This commit is contained in:
Timon Kruiper 2023-01-30 15:28:46 +01:00 • committed by Jelle Raaijmakers
parent b2e223d2bc
commit 4b0f8e9a20
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibC/elf.h
View file

@ -821,3 +821,5 @@ struct elf_args {
#define R_X86_64_RELATIVE 8 #define R_X86_64_RELATIVE 8
#define R_X86_64_TPOFF64 18 #define R_X86_64_TPOFF64 18
#define R_X86_64_IRELATIVE 37 #define R_X86_64_IRELATIVE 37
#define R_AARCH64_RELATIVE 1027

2
Userland/Libraries/LibELF/Relocation.cpp
View file

@ -59,7 +59,7 @@ bool perform_relative_relocations(FlatPtr base_address)
for (unsigned i = 0; i < relocation_count; ++i) { for (unsigned i = 0; i < relocation_count; ++i) {
size_t offset_in_section = i * relocation_entry_size; size_t offset_in_section = i * relocation_entry_size;
auto* relocation = (ElfW(Rela)*)(relocation_section_addr + offset_in_section); auto* relocation = (ElfW(Rela)*)(relocation_section_addr + offset_in_section);
VERIFY(ELF64_R_TYPE(relocation->r_info) == R_X86_64_RELATIVE); VERIFY(ELF64_R_TYPE(relocation->r_info) == R_X86_64_RELATIVE || ELF64_R_TYPE(relocation->r_info) == R_AARCH64_RELATIVE);
auto* patch_address = (FlatPtr*)(base_address + relocation->r_offset); auto* patch_address = (FlatPtr*)(base_address + relocation->r_offset);
FlatPtr relocated_address; FlatPtr relocated_address;
if (use_addend) { if (use_addend) {