Skip to content
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

(feat): Add memfd secret based allocation #16

Merged
merged 16 commits into from
Jun 6, 2024
Merged

(feat): Add memfd secret based allocation #16

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ea962f1
(feat): Add memfd secret style allocation
prabhpreet May 23, 2024
9824417
Fix error on compilation on non-linux targets
prabhpreet May 23, 2024
38e1d6b
Review changes: move to another file, add tests, add behind feature
prabhpreet May 24, 2024
abd3d99
Review changes: alloc_ext deps in test, reorganize allocext
prabhpreet May 27, 2024
d675c19
Apply review suggestion
prabhpreet May 27, 2024
3a1646c
Fuzz test findings- close fd when freeing
prabhpreet May 28, 2024
6b33cbe
Sanity check tests: add tests to probe changes in guard_pages, canary
prabhpreet May 30, 2024
7e185b5
Add memfd secret bench
prabhpreet May 30, 2024
30e7d82
Review: Add memzero on free, assert unprotected_size + fd <= PAGE_SIZE
prabhpreet Jun 4, 2024
1f143c2
Review: Match memzero to only erase unprotected memory
prabhpreet Jun 4, 2024
23e59ef
Remove/add lints for CI
prabhpreet Jun 4, 2024
6b17d75
Missed file: Remove lint for CI
prabhpreet Jun 5, 2024
0683767
Ignore incompatible tests on Windows CI
prabhpreet Jun 5, 2024
063c852
Move malloc test to differnet files, allow lint for CI pass
prabhpreet Jun 5, 2024
eba29d5
Move malloc test to different file
prabhpreet Jun 5, 2024
d02c89a
Make Linux CI pass
prabhpreet Jun 5, 2024
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
13 changes: 5 additions & 8 deletions memsec-test/tests/malloc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,12 @@ fn malloc_mprotect_1_test() {
}
}

procspawn::enable_test_support!();
#[cfg(unix)]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can put it into a separate file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

mod unix_only {

use std::ptr::NonNull;
procspawn::enable_test_support!();
use std::time::Duration;

use serde::{Deserialize, Serialize};

#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
Expand All @@ -106,7 +108,6 @@ enum TestState {
Free,
}

#[cfg(unix)]
fn attempt_write_in_region(
offset: Offset,
end_process_normally: bool,
Expand Down Expand Up @@ -205,7 +206,6 @@ fn attempt_write_in_region(
assert!(r.is_ok() == end_process_normally);
}

#[cfg(unix)]
#[test]
fn malloc_probe_outside_normal() {
attempt_write_in_region(
Expand All @@ -220,7 +220,6 @@ fn malloc_probe_outside_normal() {
);
}

#[cfg(unix)]
#[test]
fn malloc_probe_outside_limits_canary() {
//Canary changes crash the process
Expand All @@ -236,7 +235,6 @@ fn malloc_probe_outside_limits_canary() {
);
}

#[cfg(unix)]
#[test]
fn malloc_probe_outside_limits_page_above() {
attempt_write_in_region(
Expand All @@ -246,7 +244,6 @@ fn malloc_probe_outside_limits_page_above() {
);
}

#[cfg(unix)]
#[test]
fn malloc_probe_outside_limits_two_pages_above() {
attempt_write_in_region(
Expand All @@ -256,7 +253,6 @@ fn malloc_probe_outside_limits_two_pages_above() {
);
}

#[cfg(unix)]
#[test]
fn malloc_probe_outside_limits_page_after_above() {
attempt_write_in_region(
Expand All @@ -265,3 +261,4 @@ fn malloc_probe_outside_limits_page_after_above() {
vec![TestState::Init, TestState::Allocate, TestState::Operation],
);
}
}
Loading