Skip to content

cherry-pick the fix from release/2.2 #183

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
ComixHe merged 1 commit into from
Jun 25, 2026
Merged

cherry-pick the fix from release/2.2 #183

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
10 changes: 7 additions & 3 deletions src/linyaps_box/container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,7 @@ void do_pivot_root(const linyaps_box::container &container,
LINYAPS_BOX_DEBUG() << "start pivot root";
LINYAPS_BOX_DEBUG() << linyaps_box::utils::inspect_fds();
auto old_root = linyaps_box::utils::open("/", O_DIRECTORY | O_PATH | O_CLOEXEC);
auto new_root = linyaps_box::utils::open(rootfs.c_str(), O_DIRECTORY | O_RDONLY | O_CLOEXEC);
auto new_root = linyaps_box::utils::open(rootfs.c_str(), O_DIRECTORY | O_PATH | O_CLOEXEC);

auto old_root_stat = linyaps_box::utils::statfs(old_root);
LINYAPS_BOX_DEBUG() << "Pivot root old root: " << dump(old_root_stat.f_flags);
Expand Down Expand Up @@ -1471,8 +1471,12 @@ void do_pivot_root(const linyaps_box::container &container,
throw std::system_error(errno, std::system_category(), "fchdir");
}

// make sure that umount event couldn't propagate to host
container_ns::do_propagation_mount(old_root, MS_REC | MS_PRIVATE);
// make sure that umount event couldn't propagate to host.
// target the old root via cwd "." (set by fchdir(old_root) above); do NOT use
// old_root.current_path(); after pivot_root(".", ".") the old_root fd's readlink
// resolves to "/" (= new root X), which would recursively privatize X and all
// submounts (e.g. /run/media, /sys), overriding their inherited propagation.
syscall_mount(nullptr, ".", nullptr, MS_REC | MS_PRIVATE, nullptr);

// umount old root
ret = umount2(".", MNT_DETACH);
Expand Down
Loading