Merge pull request #9942 from lucaswerkmeister/9939
seccomp: fix #9939 and allow specifying multiple errnos for syscall
This commit is contained in:
commit
a5404992cc
|
@ -1057,7 +1057,15 @@ int seccomp_parse_syscall_filter_full(
|
||||||
if (!(flags & SECCOMP_PARSE_INVERT) == !!(flags & SECCOMP_PARSE_WHITELIST)) {
|
if (!(flags & SECCOMP_PARSE_INVERT) == !!(flags & SECCOMP_PARSE_WHITELIST)) {
|
||||||
r = hashmap_put(filter, INT_TO_PTR(id + 1), INT_TO_PTR(errno_num));
|
r = hashmap_put(filter, INT_TO_PTR(id + 1), INT_TO_PTR(errno_num));
|
||||||
if (r < 0)
|
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:
|
||||||
|
assert_se(hashmap_update(filter, INT_TO_PTR(id + 1), INT_TO_PTR(errno_num)) == 0);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return r;
|
||||||
|
}
|
||||||
} else
|
} else
|
||||||
(void) hashmap_remove(filter, INT_TO_PTR(id + 1));
|
(void) hashmap_remove(filter, INT_TO_PTR(id + 1));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue