picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cgroup: voidify a few things

Browse source
This commit is contained in:
Lennart Poettering 2018-10-12 18:32:22 +02:00
parent b9839ac9d9
commit 913c898ca0
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/cgroup.c
View file

@ -500,9 +500,9 @@ static int whitelist_major(BPFProgram *prog, const char *path, const char *name,
if (!prog) if (!prog)
continue; continue;
cgroup_bpf_whitelist_major(prog, (void) cgroup_bpf_whitelist_major(prog,
type == 'c' ? BPF_DEVCG_DEV_CHAR : BPF_DEVCG_DEV_BLOCK, type == 'c' ? BPF_DEVCG_DEV_CHAR : BPF_DEVCG_DEV_BLOCK,
maj, acc); maj, acc);
} else { } else {
char buf[2+DECIMAL_STR_MAX(unsigned)+3+4]; char buf[2+DECIMAL_STR_MAX(unsigned)+3+4];
@ -1080,10 +1080,10 @@ static void cgroup_context_apply(
const char *x, *y; const char *x, *y;
NULSTR_FOREACH_PAIR(x, y, auto_devices) NULSTR_FOREACH_PAIR(x, y, auto_devices)
whitelist_device(prog, path, x, y); (void) whitelist_device(prog, path, x, y);
/* PTS (/dev/pts) devices may not be duplicated, but accessed */ /* PTS (/dev/pts) devices may not be duplicated, but accessed */
whitelist_major(prog, path, "pts", 'c', "rw"); (void) whitelist_major(prog, path, "pts", 'c', "rw");
} }
LIST_FOREACH(device_allow, a, c->device_allow) { LIST_FOREACH(device_allow, a, c->device_allow) {
@ -1103,11 +1103,11 @@ static void cgroup_context_apply(
acc[k++] = 0; acc[k++] = 0;
if (path_startswith(a->path, "/dev/")) if (path_startswith(a->path, "/dev/"))
whitelist_device(prog, path, a->path, acc); (void) whitelist_device(prog, path, a->path, acc);
else if ((val = startswith(a->path, "block-"))) else if ((val = startswith(a->path, "block-")))
whitelist_major(prog, path, val, 'b', acc); (void) whitelist_major(prog, path, val, 'b', acc);
else if ((val = startswith(a->path, "char-"))) else if ((val = startswith(a->path, "char-")))
whitelist_major(prog, path, val, 'c', acc); (void) whitelist_major(prog, path, val, 'c', acc);
else else
log_unit_debug(u, "Ignoring device %s while writing cgroup attribute.", a->path); log_unit_debug(u, "Ignoring device %s while writing cgroup attribute.", a->path);
} }