1
0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00

core/execute: sort conditions to make them match documentation

This commit is contained in:
Yu Watanabe 2021-03-08 10:37:43 +09:00
parent 266d0bb9e0
commit 0538d2a811

View File

@ -1430,21 +1430,21 @@ static bool context_has_no_new_privileges(const ExecContext *c) {
return false;
/* We need NNP if we have any form of seccomp and are unprivileged */
return context_has_address_families(c) ||
return c->lock_personality ||
c->memory_deny_write_execute ||
c->restrict_realtime ||
c->restrict_suid_sgid ||
exec_context_restrict_namespaces_set(c) ||
c->private_devices ||
c->protect_clock ||
c->protect_hostname ||
c->protect_kernel_tunables ||
c->protect_kernel_modules ||
c->protect_kernel_logs ||
c->private_devices ||
context_has_syscall_filters(c) ||
context_has_syscall_logs(c) ||
context_has_address_families(c) ||
exec_context_restrict_namespaces_set(c) ||
c->restrict_realtime ||
c->restrict_suid_sgid ||
!set_isempty(c->syscall_archs) ||
c->lock_personality ||
c->protect_hostname;
context_has_syscall_filters(c) ||
context_has_syscall_logs(c);
}
static bool exec_context_has_credentials(const ExecContext *context) {