Skip to content

cgroup, devices: change skip condition #384

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
rhatdan merged 1 commit into from
Jun 2, 2020
Merged

cgroup, devices: change skip condition #384

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
26 changes: 18 additions & 8 deletions src/libcrun/cgroup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2123,19 +2123,29 @@ write_devices_resources_v2 (int dirfd, runtime_spec_schema_defs_linux_device_cgr
/* If writing the resources ebpf failed, check if it is fine to ignore the error. */
for (i = 0; i < devs_len; i++)
{
int rwm;

rwm = is_rwm (devs[i]->access, err);
if (UNLIKELY (rwm < 0))
return rwm;

if (devs[i]->allow || (rwm == 0))
if (devs[i]->allow_present && !devs[i]->allow)
{
can_skip = false;
break;
}
}

if (! can_skip)
{
libcrun_error_t tmp_err = NULL;
int rootless;

rootless = is_rootless (&tmp_err);
if (UNLIKELY (rootless < 0))
{
crun_error_release (err);
*err = tmp_err;
return ret;
}
if (rootless)
can_skip = true;
}

if (can_skip)
{
crun_error_release (err);
Expand Down Expand Up @@ -2665,7 +2675,7 @@ libcrun_update_cgroup_resources (int cgroup_mode, runtime_spec_schema_config_lin
if (UNLIKELY (rwm < 0))
return rwm;

if (resources->devices[i]->allow || (rwm == 0))
if (rwm == 0)
return crun_make_error (err, 0, "cannot set limits without cgroups");
}

Expand Down