Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ miniz_oxide = {version = "0.8", default-features = false, features = ["simd", "w
nom = {version = "7", optional = true}
rustc-demangle = {version = "0.1", optional = true}
tracing = {version = "0.1", default-features = false, features = ["attributes"], optional = true}
xz2 = "0.1.7"
zstd = {version = "0.13", default-features = false, optional = true}

[dev-dependencies]
Expand Down
61 changes: 59 additions & 2 deletions src/elf/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use std::fmt::Formatter;
use std::fmt::Result as FmtResult;
use std::fs::File;
use std::io;
use std::io::Read as _;
use std::io::Seek as _;
use std::io::SeekFrom;
use std::mem;
Expand Down Expand Up @@ -437,6 +438,8 @@ struct Cache<'elf, B> {
dynsym: OnceCell<SymbolTableCache<'elf>>,
/// The section data.
section_data: OnceCell<Box<[OnceCell<Cow<'elf, [u8]>>]>>,
/// Potential gnu_debugdata contents.
debugdata: OnceCell<Cow<'elf, [u8]>>,
}

impl<'elf, B> Cache<'elf, B>
Expand All @@ -454,6 +457,7 @@ where
symtab: OnceCell::new(),
dynsym: OnceCell::new(),
section_data: OnceCell::new(),
debugdata: OnceCell::new(),
}
}

Expand Down Expand Up @@ -807,10 +811,61 @@ where
Ok(syms)
}

fn parse_debugdata(&self) -> Result<Option<Vec<u8>>> {
let idx = if let Some(idx) = self.find_section(".gnu_debugdata")? {
idx
} else {
// The symbol table does not exists. Fake an empty one.
return Ok(None)
};

let shdr = self.section_hdr(idx)?;

// XXX not sure if this can actually happen for .gnu_debugdata
if shdr.type_() == SHT_NOBITS {
return Ok(None)
}

let sh_size = shdr.size();
let sh_offset = shdr.offset();

let data = self.backend.read_pod_slice::<u8>(sh_offset, sh_size as usize)
.with_context(|| "failed to read .gnu_debugdata section data")?;

// decompress xz data
let mut decoder = xz2::read::XzDecoder::new(data.deref());
let mut decompressed = Vec::new();
decoder
.read_to_end(&mut decompressed)
.with_context(|| "failed to decompress .gnu_debugdata section data")?;

Ok(Some(decompressed))
}

fn ensure_symtab_cache(&self) -> Result<&SymbolTableCache<'elf>> {
self.symtab.get_or_try_init_(|| {
let syms = self.parse_syms(".symtab")?;
let strtab = self.parse_strs(".strtab")?;
let mut syms = self.parse_syms(".symtab")?;
let mut strtab = self.parse_strs(".strtab")?;
if syms.is_empty() {
let data = self.debugdata.get_or_try_init_(|| {
if let Some(data) = self.parse_debugdata()? {
Result::<_, Error>::Ok(Cow::Owned(data))
} else {
Ok(Cow::Borrowed([].as_slice()))
}
})?;
if !data.is_empty() {
// to allow self-referentiality here, we have to artificially
// extend the lifetime of `data` to `'elf`
// XXX is this safe, is there a better way?
let data_slice = unsafe {
mem::transmute::<&[u8], &'elf [u8]>(&data)
};
let cache = Cache::new(data_slice);
syms = cache.parse_syms(".symtab")?;
strtab = cache.parse_strs(".strtab")?;
}
}
let cache = SymbolTableCache::new(syms, strtab);
Ok(cache)
})
Expand Down Expand Up @@ -2052,6 +2107,7 @@ mod tests {
symtab: OnceCell::new(),
dynsym: OnceCell::new(),
section_data: OnceCell::new(),
debugdata: OnceCell::new(),
};

assert_eq!(cache.find_section(".symtab").unwrap(), Some(2));
Expand Down Expand Up @@ -2158,6 +2214,7 @@ mod tests {
symtab: OnceCell::new(),
dynsym: OnceCell::new(),
section_data: OnceCell::from(vec![OnceCell::new(), OnceCell::new()].into_boxed_slice()),
debugdata: OnceCell::new(),
};

let new_data = cache.section_data(1).unwrap();
Expand Down
Loading