8000 linux: modules: clamp when they overlap other modules by schopin-mozilla · Pull Request #215 · rust-minidump/minidump-writer · GitHub
[go: up one dir, main page]
Skip to content

linux: modules: clamp when they overlap other modules #215

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 1 commit into from
Sep 1, 2026
Merged

linux: modules: clamp when they overlap other modules #215

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
46 changes: 45 additions & 1 deletion src/linux/module_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ pub enum ModuleResolveError {
name.to_string_lossy()
)]
DuplicateUserModule { name: OsString, base_address: usize },
#[error(
"module `{}` at {base_address:#x} was clamped at {clamped_to:#x} while \
its last executable segment ends at {code_end:#x}",
name.to_string_lossy()
)]
ModuleImageClamped {
name: OsString,
base_address: usize,
code_end: usize,
clamped_to: usize,
},
}

/// Where a module's information came from.
Expand Down Expand Up @@ -162,13 +173,46 @@ pub(crate) fn resolve(
filter_out_user_overlap(&mut process_candidates, &user_candidates);
ensure_entrypoint_is_first(&mut process_candidates, entry_point);

process_candidates
let mut candidates: Vec<ModuleCandidate> = process_candidates
.into_iter()
.chain(user_candidates)
.collect();
clamp_overlapping_modules(&mut candidates, &mut soft_errors);

candidates
.into_iter()
.map(ModuleCandidate::into_module)
.collect()
}

/// Shortens any module whose image overlaps another entry of the module list.
fn clamp_overlapping_modules(
modules: &mut [ModuleCandidate],
mut soft_errors: impl WriteErrorList<ModuleResolveError>,
) {
let mut claims: Vec<usize> = modules.iter().map(|module| module.base_address).collect();
claims.sort_unstable();

for module in modules {
let Some(&claim) = claims.iter().find(|&&claim| claim > module.base_address) else {
continue;
};
if claim < module.end_address {
// Clamping is typically harmless *unless* the stuff that's cut
// out is executable code.
if claim < module.code_end {
soft_errors.push(ModuleResolveError::ModuleImageClamped {
name: module.name.clone().unwrap_or_default(),
base_address: module.base_address,
code_end: module.code_end,
clamped_to: claim,
});
}
module.end_address = claim;
}
}
}

/// Where the object behind `mapping` was loaded.
///
/// `/proc/<pid>/maps` reports where a mapping *starts*, which for an Android
Expand Down
Loading
0