Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

read/elf: symbol hash and version support #332

Merged
merged 4 commits into from
Jul 22, 2021
Merged

read/elf: symbol hash and version support #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f30fe64
read: avoid () for error types
philipc Jul 2, 2021
f6193d8
elf: more SHT definitions
philipc Jul 9, 2021
4a61a69
read/elf: hash support
philipc Jul 13, 2021
da85617
read/elf: symbol versions
philipc Jul 20, 2021
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
165 changes: 164 additions & 1 deletion examples/readobj.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,12 @@ mod elf {
SHT_RELA => print_section_rela(p, endian, data, elf, sections, section),
SHT_NOTE => print_section_notes(p, endian, data, elf, section),
SHT_GROUP => print_section_group(p, endian, data, elf, sections, section),
SHT_HASH => print_hash(p, endian, data, elf, sections, section),
SHT_GNU_HASH => print_gnu_hash(p, endian, data, elf, sections, section),
SHT_GNU_VERDEF => print_gnu_verdef(p, endian, data, elf, sections, section),
SHT_GNU_VERNEED => print_gnu_verneed(p, endian, data, elf, sections, section),
SHT_GNU_VERSYM => print_gnu_versym(p, endian, data, elf, sections, section),
// TODO:
//SHT_HASH =>
//SHT_DYNAMIC =>
//SHT_SHLIB =>
//SHT_INIT_ARRAY =>
Expand Down Expand Up @@ -792,6 +796,153 @@ mod elf {
}
}

fn print_hash<Elf: FileHeader>(
p: &mut Printer<impl Write>,
endian: Elf::Endian,
data: &[u8],
_elf: &Elf,
_sections: &SectionTable<Elf>,
section: &Elf::SectionHeader,
) {
if let Ok(Some(hash)) = section.hash_header(endian, data) {
p.group("Hash", |p| {
p.field("BucketCount", hash.bucket_count.get(endian));
p.field("ChainCount", hash.chain_count.get(endian));
});
}
/* TODO: add this in a test somewhere
if let Ok(Some(hash_table)) = section.hash(endian, data) {
if let Ok(symbols) = _sections.symbols(endian, data, SHT_DYNSYM) {
for symbol in symbols.symbols() {
let name = symbols.symbol_name(endian, symbol).unwrap();
if !symbol.is_definition(endian) {
continue;
}
let hash = hash(name);
let hash_symbol = hash_table.find(endian, name, hash, &symbols).unwrap();
let hash_name = symbols.symbol_name(endian, hash_symbol).unwrap();
assert_eq!(name, hash_name);
}
}
}
*/
}

fn print_gnu_hash<Elf: FileHeader>(
p: &mut Printer<impl Write>,
endian: Elf::Endian,
data: &[u8],
_elf: &Elf,
_sections: &SectionTable<Elf>,
section: &Elf::SectionHeader,
) {
if let Ok(Some(hash)) = section.gnu_hash_header(endian, data) {
p.group("GnuHash", |p| {
p.field("BucketCount", hash.bucket_count.get(endian));
p.field("SymbolBase", hash.symbol_base.get(endian));
p.field("BloomCount", hash.bloom_count.get(endian));
p.field("BloomShift", hash.bloom_shift.get(endian));
});
}
/* TODO: add this in a test somewhere
if let Ok(Some(hash_table)) = section.gnu_hash(endian, data) {
if let Ok(symbols) = _sections.symbols(endian, data, SHT_DYNSYM) {
for symbol in &symbols.symbols()[hash_table.symbol_base() as usize..] {
let name = symbols.symbol_name(endian, symbol).unwrap();
let hash = gnu_hash(name);
let hash_symbol = hash_table.find(endian, name, hash, &symbols).unwrap();
let hash_name = symbols.symbol_name(endian, hash_symbol).unwrap();
assert_eq!(name, hash_name);
}
}
}
*/
}

fn print_gnu_verdef<Elf: FileHeader>(
p: &mut Printer<impl Write>,
endian: Elf::Endian,
data: &[u8],
_elf: &Elf,
_sections: &SectionTable<Elf>,
section: &Elf::SectionHeader,
) {
if let Ok(Some(mut verdefs)) = section.gnu_verdef(endian, data) {
while let Ok(Some((verdef, mut verdauxs))) = verdefs.next() {
p.group("VersionDefinition", |p| {
// TODO: names
p.field("Version", verdef.vd_version.get(endian));
p.field_hex("Flags", verdef.vd_flags.get(endian));
p.flags(verdef.vd_flags.get(endian), 0, FLAGS_VER_FLG);
p.field("Index", verdef.vd_ndx.get(endian) & !VER_NDX_HIDDEN);
p.flags(verdef.vd_ndx.get(endian), 0, FLAGS_VER_NDX);
p.field("AuxCount", verdef.vd_cnt.get(endian));
p.field_hex("Hash", verdef.vd_hash.get(endian));
p.field("AuxOffset", verdef.vd_aux.get(endian));
p.field("NextOffset", verdef.vd_next.get(endian));
while let Ok(Some(verdaux)) = verdauxs.next() {
p.group("Aux", |p| {
p.field_hex("Name", verdaux.vda_name.get(endian));
p.field("NextOffset", verdaux.vda_next.get(endian));
});
}
});
}
}
}

fn print_gnu_verneed<Elf: FileHeader>(
p: &mut Printer<impl Write>,
endian: Elf::Endian,
data: &[u8],
_elf: &Elf,
_sections: &SectionTable<Elf>,
section: &Elf::SectionHeader,
) {
if let Ok(Some(mut verneeds)) = section.gnu_verneed(endian, data) {
while let Ok(Some((verneed, mut vernauxs))) = verneeds.next() {
p.group("VersionNeed", |p| {
// TODO: names
p.field("Version", verneed.vn_version.get(endian));
p.field("AuxCount", verneed.vn_cnt.get(endian));
p.field_hex("Filename", verneed.vn_file.get(endian));
p.field("AuxOffset", verneed.vn_aux.get(endian));
p.field("NextOffset", verneed.vn_next.get(endian));
while let Ok(Some(vernaux)) = vernauxs.next() {
p.group("Aux", |p| {
p.field_hex("Hash", vernaux.vna_hash.get(endian));
p.field_hex("Flags", vernaux.vna_flags.get(endian));
p.flags(vernaux.vna_flags.get(endian), 0, FLAGS_VER_FLG);
p.field("Index", vernaux.vna_other.get(endian) & !VER_NDX_HIDDEN);
p.flags(vernaux.vna_other.get(endian), 0, FLAGS_VER_NDX);
p.field_hex("Name", vernaux.vna_name.get(endian));
p.field("NextOffset", vernaux.vna_next.get(endian));
});
}
});
}
}
}

fn print_gnu_versym<Elf: FileHeader>(
p: &mut Printer<impl Write>,
endian: Elf::Endian,
data: &[u8],
_elf: &Elf,
_sections: &SectionTable<Elf>,
section: &Elf::SectionHeader,
) {
if let Ok(Some(syms)) = section.gnu_versym(endian, data) {
for sym in syms {
p.group("VersionSymbol", |p| {
p.field("Version", sym.0.get(endian) & !VER_NDX_HIDDEN);
p.flags(sym.0.get(endian), 0, FLAGS_VER_NDX);
// TODO: version name
});
}
}
}

static FLAGS_EI_CLASS: &[Flag<u8>] = &flags!(ELFCLASSNONE, ELFCLASS32, ELFCLASS64);
static FLAGS_EI_DATA: &[Flag<u8>] = &flags!(ELFDATANONE, ELFDATA2LSB, ELFDATA2MSB);
static FLAGS_EV: &[Flag<u8>] = &flags!(EV_NONE, EV_CURRENT);
Expand Down Expand Up @@ -1173,6 +1324,16 @@ mod elf {
SHT_PREINIT_ARRAY,
SHT_GROUP,
SHT_SYMTAB_SHNDX,
SHT_GNU_ATTRIBUTES,
SHT_GNU_HASH,
SHT_GNU_LIBLIST,
SHT_CHECKSUM,
SHT_SUNW_move,
SHT_SUNW_COMDAT,
SHT_SUNW_syminfo,
SHT_GNU_VERDEF,
SHT_GNU_VERNEED,
SHT_GNU_VERSYM,
);
static FLAGS_SHT_MIPS: &[Flag<u32>] = &flags!(
SHT_MIPS_LIBLIST,
Expand Down Expand Up @@ -3180,6 +3341,8 @@ mod elf {
DF_1_STUB,
DF_1_PIE,
);
static FLAGS_VER_FLG: &[Flag<u16>] = &flags!(VER_FLG_BASE, VER_FLG_WEAK);
static FLAGS_VER_NDX: &[Flag<u16>] = &flags!(VER_NDX_HIDDEN);
}

mod macho {
Expand Down
Loading