Skip to content

Commit

Permalink
fix: add comments to no-pivot related code
Browse files Browse the repository at this point in the history
Signed-off-by: xujihui1985 <xujihui1985@gmail.com>
  • Loading branch information
xujihui1985 committed Oct 14, 2024
1 parent c82496b commit 6aa2ce5
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
8 changes: 8 additions & 0 deletions crates/libcontainer/src/process/container_init_process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@ fn reopen_dev_null() -> Result<()> {
Ok(())
}

// umount or hide the target path. If the target path is mounted
// try to unmount it first if the unmount operation fails with EINVAL
// then mount a tmpfs with size 0k to hide the target path.
fn unmount_or_hide(syscall: &dyn Syscall, target: impl AsRef<Path>) -> Result<()> {
let target_path = target.as_ref();
match syscall.umount2(target_path, MntFlags::MNT_DETACH) {
Expand All @@ -289,6 +292,11 @@ fn unmount_or_hide(syscall: &dyn Syscall, target: impl AsRef<Path>) -> Result<()

Check warning on line 292 in crates/libcontainer/src/process/container_init_process.rs

View workflow job for this annotation

GitHub Actions / check (x86_64, gnu)

Diff in /home/runner/work/youki/youki/crates/libcontainer/src/process/container_init_process.rs

Check warning on line 292 in crates/libcontainer/src/process/container_init_process.rs

View workflow job for this annotation

GitHub Actions / check (x86_64, musl)

Diff in /home/runner/work/youki/youki/crates/libcontainer/src/process/container_init_process.rs

Check warning on line 292 in crates/libcontainer/src/process/container_init_process.rs

View workflow job for this annotation

GitHub Actions / check (aarch64, gnu)

Diff in /home/runner/work/youki/youki/crates/libcontainer/src/process/container_init_process.rs
fn move_root(syscall: &dyn Syscall, rootfs: &Path) -> Result<()> {
unistd::chdir(rootfs).map_err(InitProcessError::NixOther)?;
// umount /sys and /proc if they are mounted, the purpose is to
// unmount or hide the /sys and /proc filesystems before the process changes its
// root to the new rootfs. thus ensure that the /sys and /proc filesystems are not
// accessible in the new rootfs. the logic is borrowed from crun
// https://github.com/containers/crun/blob/53cd1c1c697d7351d0cad23708d29bf4a7980a3a/src/libcrun/linux.c#L2780
unmount_or_hide(syscall, "/sys")?;
unmount_or_hide(syscall, "/proc")?;
syscall
Expand Down
7 changes: 7 additions & 0 deletions tests/contest/runtimetest/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,10 @@ pub fn test_io_priority_class(spec: &Spec, io_priority_class: IOPriorityClass) {
}
}

// the validate_rootfs function is used to validate the rootfs of the container is
// as expected. This function is used in the no_pivot test to validate the rootfs
pub fn validate_rootfs() {
// list the first level directories in the rootfs
let mut entries = fs::read_dir("/")
.unwrap()
.filter_map(|entry| {
Expand All @@ -561,13 +564,17 @@ pub fn validate_rootfs() {
})
})
.collect::<Vec<String>>();
// sort the entries to make the test deterministic
entries.sort();

// this is the list of directories that we expect to find in the rootfs
let mut expected = vec![
"bin", "dev", "etc", "home", "proc", "root", "sys", "tmp", "usr", "var",
];
// sort the expected entries to make the test deterministic
expected.sort();

// compare the expected entries with the actual entries
if entries != expected {
eprintln!("error due to rootfs want {expected:?}, got {entries:?}");
}
Expand Down

0 comments on commit 6aa2ce5

Please sign in to comment.