Skip to content

cgroup, systemd: do not override devices on update #1614

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

cgroup, systemd: do not override devices on update #1614

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
25 changes: 21 additions & 4 deletions src/libcrun/cgroup-systemd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,7 +1265,17 @@ append_devices (sd_bus_message *m,
size_t i;

if (has_allow_all (resources->devices, resources->devices_len))
return 0;
{
sd_err = sd_bus_message_append (m, "(sv)", "DevicePolicy", "s", "auto");
if (UNLIKELY (sd_err < 0))
return crun_make_error (err, -sd_err, "sd-bus message append DevicePolicy");

sd_err = sd_bus_message_append (m, "(sv)", "DeviceAllow", "a(ss)", 0);
if (UNLIKELY (sd_err < 0))
return crun_make_error (err, -sd_err, "sd-bus message append empty DeviceAllow");

return 0;
}

sd_err = sd_bus_message_append (m, "(sv)", "DevicePolicy", "s", "strict");
if (UNLIKELY (sd_err < 0))
Expand Down Expand Up @@ -1331,6 +1341,7 @@ append_devices (sd_bus_message *m,

static int
append_resources (sd_bus_message *m,
bool is_update,
const char *state_dir,
runtime_spec_schema_config_linux_resources *resources,
int cgroup_mode,
Expand Down Expand Up @@ -1475,7 +1486,13 @@ append_resources (sd_bus_message *m,
# undef APPEND_UINT64
# undef APPEND_UINT64_VALUE

return append_devices (m, resources, err);
if (! is_update || resources->devices)
{
ret = append_devices (m, resources, err);
if (UNLIKELY (ret < 0))
return ret;
}
return 0;
}

static int
Expand Down Expand Up @@ -1647,7 +1664,7 @@ enter_systemd_cgroup_scope (runtime_spec_schema_config_linux_resources *resource
}
}

ret = append_resources (m, state_dir, resources, cgroup_mode, err);
ret = append_resources (m, false, state_dir, resources, cgroup_mode, err);
if (UNLIKELY (ret < 0))
goto exit;

Expand Down Expand Up @@ -1957,7 +1974,7 @@ libcrun_update_resources_systemd (struct libcrun_cgroup_status *cgroup_status,
goto exit;
}

ret = append_resources (m, state_dir, resources, cgroup_mode, err);
ret = append_resources (m, true, state_dir, resources, cgroup_mode, err);
if (UNLIKELY (ret < 0))
goto exit;

Expand Down
Loading