summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-08-21 12:48:44 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-08-21 12:48:44 +0100
commitfd3cced366958cc90f0a8caa8213471afde9bf3c (patch)
treef43f6cb8cb337ca75a56bafd6bb76186a4414c27
parent2656eb7c599e306b95bad82b1372fc49ba3088f6 (diff)
parentb22876cc2f863c58cfebd4a5301fc47e8ec89228 (diff)
downloadqemu-fd3cced366958cc90f0a8caa8213471afde9bf3c.tar.gz
qemu-fd3cced366958cc90f0a8caa8213471afde9bf3c.tar.bz2
qemu-fd3cced366958cc90f0a8caa8213471afde9bf3c.zip
Merge remote-tracking branch 'remotes/otubo/seccomp' into staging
* remotes/otubo/seccomp: seccomp: add semctl() to the syscall whitelist Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--qemu-seccomp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/qemu-seccomp.c b/qemu-seccomp.c
index ea8094d043..0503764047 100644
--- a/qemu-seccomp.c
+++ b/qemu-seccomp.c
@@ -230,7 +230,8 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
{ SCMP_SYS(timerfd_create), 240 },
{ SCMP_SYS(shmctl), 240 },
{ SCMP_SYS(mlock), 240 },
- { SCMP_SYS(munlock), 240 }
+ { SCMP_SYS(munlock), 240 },
+ { SCMP_SYS(semctl), 240 }
};
int seccomp_start(void)