summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-01-23 13:24:17 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-01-23 13:24:17 +0000
commita46b3aaf6bb038d4f6f192a84df204f10929e75c (patch)
treec68ee4369cb95c272377d6063b7da1473fd3072c
parentc6441452b50c44fdbb362b239ce623f77cf3cd51 (diff)
parent4b45b055491a319292beefb8080a81d96cf55cf6 (diff)
downloadhqemu-a46b3aaf6bb038d4f6f192a84df204f10929e75c.zip
hqemu-a46b3aaf6bb038d4f6f192a84df204f10929e75c.tar.gz
Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20150123' into staging
seccomp branch queue # gpg: Signature made Fri 23 Jan 2015 13:11:05 GMT using RSA key ID 12F8BD2F # gpg: Can't check signature: public key not found * remotes/otubo/tags/pull-seccomp-20150123: seccomp: add mlockall to whitelist Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--qemu-seccomp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/qemu-seccomp.c b/qemu-seccomp.c
index b0c6269..f9de0d3 100644
--- a/qemu-seccomp.c
+++ b/qemu-seccomp.c
@@ -229,6 +229,7 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
{ SCMP_SYS(shmdt), 240 },
{ SCMP_SYS(timerfd_create), 240 },
{ SCMP_SYS(shmctl), 240 },
+ { SCMP_SYS(mlockall), 240 },
{ SCMP_SYS(mlock), 240 },
{ SCMP_SYS(munlock), 240 },
{ SCMP_SYS(semctl), 240 },
OpenPOWER on IntegriCloud