Skip to content

The fixtures object parses are 8-aligned by their type, and its header refusal is loud #731

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

Closed
Japabu wants to merge 1 commit into from
Closed

The fixtures object parses are 8-aligned by their type, and its header refusal is loud #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions toyos-elf/tests/real.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@

use toyos_elf::{Layout, Machine};

const HEADERS: &[u8] = include_bytes!("fixtures/toyos-ld-headers.bin");
/// `object` reads an ELF header in place, so the bytes need its 8-byte alignment.
#[repr(C, align(8))]
struct Aligned<T>(T);

static HEADERS: &[u8] = &Aligned(*include_bytes!("fixtures/toyos-ld-headers.bin")).0;

#[test]
fn a_toyos_ld_binary_parses_to_what_readelf_says() {
Expand Down Expand Up @@ -55,14 +59,14 @@ fn a_toyos_ld_binary_parses_to_what_readelf_says() {
/// The first 4 KiB of `/system/bin/shell` as rust-lld linked it with
/// `--build-id`: `dd if=userland/target/x86_64-unknown-toyos/toyos/shell
/// of=toyos-elf/tests/fixtures/lld-headers.bin bs=4096 count=1`.
const LLD_HEADERS: &[u8] = include_bytes!("fixtures/lld-headers.bin");
static LLD_HEADERS: &[u8] = &Aligned(*include_bytes!("fixtures/lld-headers.bin")).0;

/// The build-id `object` reads out of `file`'s program headers.
fn objects_build_id(file: &[u8]) -> Option<Vec<u8>> {
use object::read::elf::{FileHeader, ProgramHeader};
let header = object::elf::FileHeader64::<object::LittleEndian>::parse(file).ok()?;
let endian = header.endian().ok()?;
for phdr in header.program_headers(endian, file).ok()? {
let header = object::elf::FileHeader64::<object::LittleEndian>::parse(file).expect("object reads the file header");
let endian = header.endian().expect("object reads the byte order");
for phdr in header.program_headers(endian, file).expect("object reads the program headers") {
let Ok(Some(mut notes)) = phdr.notes(endian, file) else { continue };
while let Ok(Some(note)) = notes.next() {
if note.name() == b"GNU" && note.n_type(endian) == object::elf::NT_GNU_BUILD_ID {
Expand Down
6 changes: 5 additions & 1 deletion toyos-symbols/tests/name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ use object::{Object, ObjectSymbol, SymbolKind};
use toyos_symbols::frame::BuildId;
use toyos_symbols::{name, Check, Named, Unnamed};

const BINARY: &[u8] = include_bytes!("fixtures/input-test.bin");
/// `object` reads an ELF header in place, so the bytes need its 8-byte alignment.
#[repr(C, align(8))]
struct Aligned<T>(T);

static BINARY: &[u8] = &Aligned(*include_bytes!("fixtures/input-test.bin")).0;

/// `input-test` with its `PT_GNU_EH_FRAME` turned into a `PT_NOTE` over a
/// build-id note appended past its end, far past its header page.
Expand Down