diff options
| author | Lucas Werkmeister <mail@lucaswerkmeister.de> | 2018-08-26 00:27:29 +0200 |
|---|---|---|
| committer | Lucas Werkmeister <mail@lucaswerkmeister.de> | 2018-08-29 21:42:03 +0200 |
| commit | 851ee70a3da1263a8eb9e7f230d2e18462ec2ead (patch) | |
| tree | c368ebaccb21384022a5383641723f541a4a6672 /src/shared/seccomp-util.c | |
| parent | resolve: update comment, avoid alarming wrongness (diff) | |
| download | systemd-851ee70a3da1263a8eb9e7f230d2e18462ec2ead.tar.xz systemd-851ee70a3da1263a8eb9e7f230d2e18462ec2ead.zip | |
seccomp: improve error reporting
Only report OOM if that was actually the error of the operation,
explicitly report the possible error that a syscall was already blocked
with a different errno and translate that into a more sensible errno
(EEXIST only makes sense in connection to the hashmap), and pass through
all other potential errors unmodified. Part of #9939.
Diffstat (limited to 'src/shared/seccomp-util.c')
| -rw-r--r-- | src/shared/seccomp-util.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c index ade3c656af..5072ceb2d1 100644 --- a/src/shared/seccomp-util.c +++ b/src/shared/seccomp-util.c @@ -1057,7 +1057,17 @@ int seccomp_parse_syscall_filter_full( if (!(flags & SECCOMP_PARSE_INVERT) == !!(flags & SECCOMP_PARSE_WHITELIST)) { r = hashmap_put(filter, INT_TO_PTR(id + 1), INT_TO_PTR(errno_num)); if (r < 0) - return flags & SECCOMP_PARSE_LOG ? log_oom() : -ENOMEM; + switch (r) { + case -ENOMEM: + return flags & SECCOMP_PARSE_LOG ? log_oom() : -ENOMEM; + case -EEXIST: + if (flags & SECCOMP_PARSE_LOG) + log_warning("System call %s already blocked with different errno: %d", + name, PTR_TO_INT(hashmap_get(filter, INT_TO_PTR(id + 1)))); + return -EINVAL; + default: + return r; + } } else (void) hashmap_remove(filter, INT_TO_PTR(id + 1)); } |