Skip to content

aya: fix uprobe ProcMapEntry parsing and add comprehensive tests #1435

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
Mufanc wants to merge 1 commit into from
Closed

aya: fix uprobe ProcMapEntry parsing and add comprehensive tests #1435

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
36 changes: 34 additions & 2 deletions aya/src/programs/uprobe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ impl<'a> ProcMapEntry<'a> {
};

let mut parts = line
.split(|b| b.is_ascii_whitespace())
.splitn(6, |b| b.is_ascii_whitespace())
.filter(|part| !part.is_empty());

let mut next = || parts.next().ok_or_else(err);
Expand Down Expand Up @@ -419,7 +419,7 @@ impl<'a> ProcMapEntry<'a> {

let path = parts
.next()
.and_then(|path| match path {
.and_then(|path| match path.trim_ascii() {
[b'[', .., b']'] => None,
path => {
let path = Path::new(OsStr::from_bytes(path));
Expand Down Expand Up @@ -1024,6 +1024,38 @@ mod tests {
);
}

#[test]
fn test_parse_proc_map_anon_region_with_spaces() {
assert_matches!(
ProcMapEntry::parse(b"7302f31000-73031e0000 ---p 00000000 00:00 0 [anon:cfi shadow]"),
Ok(ProcMapEntry {
address: 0x7302f31000,
address_end: 0x73031e0000,
perms,
offset: 0,
dev,
inode: 0,
path: None,
}) if perms == "---p" && dev == "00:00"
);
}

#[test]
fn test_parse_proc_map_without_path() {
assert_matches!(
ProcMapEntry::parse(b"7382f80000-7382f81000 ---p 00000000 00:00 0 "),
Ok(ProcMapEntry {
address: 0x7382f80000,
address_end: 0x7382f81000,
perms,
offset: 0,
dev,
inode: 0,
path: None,
}) if perms == "---p" && dev == "00:00"
);
}

#[test]
fn test_proc_map_find_lib_by_name() {
let proc_map_libs = ProcMap {
Expand Down
Loading