Skip to content

Warn on segment size mismatch #5

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
msuiche merged 4 commits into from
Jan 27, 2023
Merged

Warn on segment size mismatch #5

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
4a344bc
feat: Print out error if pkg-config fails
rmccrystal Jan 27, 2023
cde16c4
fix: Change `assert!(x == y)` to `assert_eq!(x, y)`
rmccrystal Jan 27, 2023
d023d34
fix: Change `assert!(x == y)` to `assert_eq!(x, y)`
rmccrystal Jan 27, 2023
1f21ef6
fix: Warn instead of panicking if /proc/iomem segment size and /proc/…
rmccrystal Jan 27, 2023
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
4 changes: 2 additions & 2 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use pkg_config::find_library;

fn main() -> Result<()> {

if !find_library("liblzma").is_ok() {
panic!("You need to install liblzma-dev. Run \"apt install liblzma-dev\"");
if let Err(e) = find_library("liblzma") {
panic!("You need to install liblzma-dev. Run \"apt install liblzma-dev\"\n\n{}", e);
}

let mut config = Config::default();
Expand Down
14 changes: 9 additions & 5 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ use std::io::SeekFrom;
use std::io::prelude::*;
use std::io::BufReader;
use std::{mem, env, cmp};
use std::cmp::max;
use std::time::{Instant};

use nix::unistd::Uid;
Expand Down Expand Up @@ -97,7 +98,7 @@ fn pause() {
let _ = stdin.read(&mut [0u8]).unwrap();
}

#[derive(Tabled)]
#[derive(Tabled, Debug)]
pub struct MemoryRange {
#[tabled(display_with = "display_u64")]
pub start_phys_addr: u64,
Expand Down Expand Up @@ -368,12 +369,13 @@ impl DumpItForLinux {
let mut out_file_off = 0;
for h in headers {
// This should always be true.
assert!(h.p_filesz(endian) == h.p_memsz(endian));
assert_eq!(h.p_filesz(endian), h.p_memsz(endian));

// NOTE: There is an issue on Amazon Linux and Ubuntu VMs where physaddr
// is null when looking at "readelf -l /proc/kcore"
// We retrieve the physical offset from /proc/iomem using the segment sizes.
for mem_range in &self.iomem_ranges {
println!("mem_range: {:#X?}", mem_range);
if h.p_paddr(endian) == mem_range.start_phys_addr ||
(h.p_paddr(endian) == 0 && h.p_filesz(endian) == mem_range.memsz) ||
(h.p_paddr(endian) >= mem_range.start_phys_addr && h.p_paddr(endian) < mem_range.end_phys_addr) {
Expand All @@ -383,9 +385,11 @@ impl DumpItForLinux {

let start_phys_addr = mem_range.start_phys_addr + delta;
let memsz = h.p_filesz(endian);
assert!(h.p_filesz(endian) == h.p_memsz(endian));
assert_eq!(h.p_filesz(endian), h.p_memsz(endian));
if !is_virtual {
assert!(memsz == mem_range.memsz);
if memsz != mem_range.memsz {
log::warn!("Mismatch between /proc/iomem segment size ({:#X}) and /proc/kcore segment size ({:#X}). Dumping {:#X} bytes.", mem_range.memsz, memsz, max(memsz, mem_range.memsz));
}
}
let end_phys_addr = start_phys_addr + memsz;
let virt_addr = h.p_vaddr(endian);
Expand All @@ -394,7 +398,7 @@ impl DumpItForLinux {
self.mem_ranges.push(MemoryRange {
start_phys_addr,
end_phys_addr,
memsz,
memsz: max(memsz, mem_range.memsz),
virt_addr,
kcore_file_off,
out_file_off,
Expand Down