8000 linux: separate mappings list from modules list by schopin-mozilla · Pull Request #212 · rust-minidump/minidump-writer · GitHub
[go: up one dir, main page]
Skip to content

linux: separate mappings list from modules list #212

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

Merged
schopin-mozilla merged 2 commits into from
Aug 31, 2026
Merged

linux: separate mappings list from modules list #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f107a38
linux: separate mappings list from modules list
schopin-mozilla Aug 18, 2026
e687a02
linux: get rid of the notion of bias in the mapping data
schopin-mozilla Aug 13, 2026
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
53 changes: 21 additions & 32 deletions src/linux/android.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
super::{
maps_reader::MappingInfo, minidump_writer::MinidumpWriter,
process_inspection::ProcessInspector, process_reader::CopyFromProcessError,
minidump_writer::MinidumpWriter, process_inspection::ProcessInspector,
process_reader::CopyFromProcessError,
},
goblin::elf,
};
Expand Down Expand Up @@ -130,37 +130,26 @@ fn parse_loaded_elf_program_headers(
}
}

pub fn late_process_mappings(
/// Compute the effective load base of the ELF library pointed at by `elf_header_addr`.
/// In most cases it would be the same as that address, but libraries that use
/// Android packed relocations might need some tweaking.
pub fn effective_load_base(
process_inspector: &dyn ProcessInspector,
mappings: &mut [MappingInfo],
) -> Result<()> {
// Only consider exec mappings that indicate a file path was mapped, and
// where the ELF header indicates a mapped shared library.
for map in mappings
.iter_mut()
.filter(|m| m.is_executable() && m.name_is_path())
{
let ehdr_opt = MinidumpWriter::copy_from_process(
process_inspector,
map.start_address,
elf_header::SIZEOF_EHDR,
)
.ok()
.and_then(|x| elf_header::Header::parse(&x).ok());

if let Some(ehdr) = ehdr_opt
&& ehdr.e_type == elf_header::ET_DYN
{
// Compute the effective load bias for this mapped library, and update
// the mapping to hold that rather than |start_addr|, at the same time
// adjusting |size| to account for the change in |start_addr|. Where
// the library does not contain Android packed relocations,
// GetEffectiveLoadBias() returns |start_addr| and the mapping entry
// is not changed.
let load_bias = get_effective_load_bias(process_inspector, &ehdr, map.start_address);
map.size += map.start_address - load_bias;
map.start_address = load_bias;
elf_header_addr: usize,
) -> usize {
let ehdr = MinidumpWriter::copy_from_process(
process_inspector,
elf_header_addr,
elf_header::SIZEOF_EHDR,
)
.ok()
.and_then(|v| elf_header::Header::parse(&v).ok());

match ehdr {
// Only a relocatable object can have been packed.
Some(ehdr) if ehdr.e_type == elf_header::ET_DYN => {
get_effective_load_bias(process_inspector, &ehdr, elf_header_addr)
}
_ => elf_header_addr,
}
Ok(())
}
Loading
Loading
0