From 571ab66114bc65df6f279d630476fb96eb434d64 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 24 Jun 2020 00:18:34 +0200 Subject: [PATCH] dyld: keep EXIDX section data through program header entry --- src/libdyld/src/elf.rs | 2 +- src/libdyld/src/lib.rs | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/libdyld/src/elf.rs b/src/libdyld/src/elf.rs index b12b7300..ddfbec6a 100644 --- a/src/libdyld/src/elf.rs +++ b/src/libdyld/src/elf.rs @@ -255,6 +255,7 @@ pub const PT_SUNWSTACK: u32 = 1879048187; pub const PT_HISUNW: u32 = 1879048191; pub const PT_HIOS: u32 = 1879048191; pub const PT_LOPROC: u32 = 1879048192; +pub const PT_ARM_EXIDX: u32 = 1879048193; pub const PT_HIPROC: u32 = 2147483647; pub const PF_X: usize = 1; pub const PF_W: usize = 2; @@ -1334,7 +1335,6 @@ pub const SHF_ARM_COMDEF: usize = 2147483648; pub const PF_ARM_SB: usize = 268435456; pub const PF_ARM_PI: usize = 536870912; pub const PF_ARM_ABS: usize = 1073741824; -pub const PT_ARM_EXIDX: usize = 1879048193; pub const SHT_ARM_EXIDX: usize = 1879048193; pub const SHT_ARM_PREEMPTMAP: usize = 1879048194; pub const SHT_ARM_ATTRIBUTES: usize = 1879048195; diff --git a/src/libdyld/src/lib.rs b/src/libdyld/src/lib.rs index 2103bbee..785609bd 100644 --- a/src/libdyld/src/lib.rs +++ b/src/libdyld/src/lib.rs @@ -4,7 +4,7 @@ extern crate alloc; extern crate log; use core::{fmt, str, convert}; -use alloc::string::String; +use alloc::{borrow::ToOwned, string::String, vec::Vec}; use log::{debug, trace}; use elf::*; @@ -60,6 +60,7 @@ fn elf_hash(name: &[u8]) -> u32 { pub struct Library { pub image: Image, dyn_section: DynamicSection, + pub exidx: Vec, } impl Library { @@ -164,21 +165,31 @@ pub fn load( .map_err(|_| "cannot allocate target image")?; debug!("ELF target: {} bytes, align to {:X}, allocated at {:08X}", image_size, image_align, image.ptr() as usize); + let mut exidx = None; // LOAD for phdr in file.program_headers() { let phdr = phdr.ok_or("cannot read program header")?; - if phdr.p_type != PT_LOAD { continue; } - trace!("Program header: {:08X}+{:08X} to {:08X}", phdr.p_offset, phdr.p_filesz, image.ptr() as u32 ); - let src = file.get(phdr.p_offset as usize..(phdr.p_offset + phdr.p_filesz) as usize) - .ok_or("program header requests an out of bounds load (in file)")?; - let dst = image.get_mut(phdr.p_vaddr as usize.. - (phdr.p_vaddr + phdr.p_filesz) as usize) - .ok_or("program header requests an out of bounds load (in target)")?; - dst.copy_from_slice(src); + let file_range = phdr.p_offset as usize..(phdr.p_offset + phdr.p_filesz) as usize; + match phdr.p_type { + PT_LOAD => { + let src = file.get(file_range) + .ok_or("program header requests an out of bounds load (in file)")?; + let dst = image.get_mut(phdr.p_vaddr as usize.. + (phdr.p_vaddr + phdr.p_filesz) as usize) + .ok_or("program header requests an out of bounds load (in target)")?; + dst.copy_from_slice(src); + } + PT_ARM_EXIDX => { + let src = file.get(file_range) + .ok_or("program header requests an out of bounds load (in file)")?; + exidx = Some(src.to_owned()); + } + _ => {} + } } // relocate DYNAMIC @@ -190,6 +201,7 @@ pub fn load( let lib = Library { image, dyn_section, + exidx: exidx.ok_or("missing EXIDX program header")?, }; for rela in lib.rela() {