shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

core: use a temporary variable for calculation of seccomp flags

Browse Source 
I think it is easier to read this way.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-04-03 08:56:06 +02:00
parent 6c34ed5111
commit e7ccdfa809
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/dbus-execute.c
View File

@ -1395,7 +1395,7 @@ int bus_exec_context_set_transient_property(
if (!UNIT_WRITE_FLAGS_NOOP(flags)) { if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
_cleanup_free_ char *joined = NULL; _cleanup_free_ char *joined = NULL;
bool invert = !whitelist; SeccompParseFlags invert_flag = whitelist ? 0 : SECCOMP_PARSE_INVERT;
char **s; char **s;
if (strv_isempty(l)) { if (strv_isempty(l)) {
@ -1414,7 +1414,10 @@ int bus_exec_context_set_transient_property(
c->syscall_whitelist = whitelist; c->syscall_whitelist = whitelist;
if (c->syscall_whitelist) { if (c->syscall_whitelist) {
r = seccomp_parse_syscall_filter("@default", -1, c->syscall_filter, SECCOMP_PARSE_WHITELIST | (invert ? SECCOMP_PARSE_INVERT : 0)); r = seccomp_parse_syscall_filter("@default",
-1,
c->syscall_filter,
SECCOMP_PARSE_WHITELIST | invert_flag);
if (r < 0) if (r < 0)
return r; return r;
} }
@ -1428,7 +1431,10 @@ int bus_exec_context_set_transient_property(
if (r < 0) if (r < 0)
return r; return r;
r = seccomp_parse_syscall_filter(n, e, c->syscall_filter, (invert ? SECCOMP_PARSE_INVERT : 0) | (c->syscall_whitelist ? SECCOMP_PARSE_WHITELIST : 0)); r = seccomp_parse_syscall_filter(n,
e,
c->syscall_filter,
(c->syscall_whitelist ? SECCOMP_PARSE_WHITELIST : 0) | invert_flag);
if (r < 0) if (r < 0)
return r; return r;
} }
@ -1506,7 +1512,6 @@ int bus_exec_context_set_transient_property(
if (!UNIT_WRITE_FLAGS_NOOP(flags)) { if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
_cleanup_free_ char *joined = NULL; _cleanup_free_ char *joined = NULL;
bool invert = !whitelist;
char **s; char **s;
if (strv_isempty(l)) { if (strv_isempty(l)) {
@ -1532,7 +1537,7 @@ int bus_exec_context_set_transient_property(
if (af < 0) if (af < 0)
return af; return af;
if (!invert == c->address_families_whitelist) { if (whitelist == c->address_families_whitelist) {
r = set_put(c->address_families, INT_TO_PTR(af)); r = set_put(c->address_families, INT_TO_PTR(af));
if (r < 0) if (r < 0)
return r; return r;