Skip to content

Remove systemd's device filter configuration if any #9

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
nbdd0121 merged 1 commit into from
Dec 1, 2024
Merged

Remove systemd's device filter configuration if any #9

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
16 changes: 16 additions & 0 deletions src/runc/container.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,22 @@ impl Container {
}
});

// runc configures systemd to also perform device filtering.
// The removal of systemd's filtering is insufficient since after daemon-reload (or maybe
// some other triggers as well), systemd will reconcile and add it back, which disrupts
// container-hotplug's operation.
// So we'll also go ahead and remove these configuration files. Ignore errors if any since
// the cgroup might be handled by runc directly if `--cgroup-manager=cgroupfs` is used.
let cgroup_name = state
.cgroup_paths
.unified
.file_name()
.context("cgroup doesn't have file name")?
.to_str()
.context("cgroup name is not UTF-8")?;
let _ = std::fs::remove_file(format!("/run/systemd/transient/{cgroup_name}.d/50-DeviceAllow.conf"));
let _ = std::fs::remove_file(format!("/run/systemd/transient/{cgroup_name}.d/50-DevicePolicy.conf"));

let cgroup_device_filter: Box<dyn DeviceAccessController + Send> =
if let Some(device_cgroup) = &state.cgroup_paths.devices {
Box::new(DeviceAccessControllerV1::new(device_cgroup)?)
Expand Down