diff options
| author | Peter Maydell | 2014-11-11 17:23:02 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-11-11 17:23:02 +0100 |
| commit | 7f06a3b14df50d85118d8a7439dcd3229822e19c (patch) | |
| tree | 3d522d6be4135694278e7c1b269c58cfa83fbdff | |
| parent | Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-11-1... (diff) | |
| parent | seccomp: change configure to avoid arm 32 to break (diff) | |
| download | qemu-7f06a3b14df50d85118d8a7439dcd3229822e19c.tar.gz qemu-7f06a3b14df50d85118d8a7439dcd3229822e19c.tar.xz qemu-7f06a3b14df50d85118d8a7439dcd3229822e19c.zip | |
Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20141111' into staging
seccomp branch queue
# gpg: Signature made Tue 11 Nov 2014 16:12:48 GMT using RSA key ID 12F8BD2F
# gpg: Can't check signature: public key not found
* remotes/otubo/tags/pull-seccomp-20141111:
seccomp: change configure to avoid arm 32 to break
seccomp: whitelist syscalls fallocate(), fadvise64(), inotify_init1() and inotify_add_watch()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | qemu-seccomp.c | 6 |
2 files changed, 7 insertions, 2 deletions
@@ -1823,7 +1823,8 @@ fi # libseccomp check if test "$seccomp" != "no" ; then - if $pkg_config --atleast-version=2.1.0 libseccomp; then + if test "$cpu" = "i386" || test "$cpu" = "x86_64" && + $pkg_config --atleast-version=2.1.1 libseccomp; then libs_softmmu="$libs_softmmu `$pkg_config --libs libseccomp`" QEMU_CFLAGS="$QEMU_CFLAGS `$pkg_config --cflags libseccomp`" seccomp="yes" diff --git a/qemu-seccomp.c b/qemu-seccomp.c index 0503764047..af6a375127 100644 --- a/qemu-seccomp.c +++ b/qemu-seccomp.c @@ -231,7 +231,11 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = { { SCMP_SYS(shmctl), 240 }, { SCMP_SYS(mlock), 240 }, { SCMP_SYS(munlock), 240 }, - { SCMP_SYS(semctl), 240 } + { SCMP_SYS(semctl), 240 }, + { SCMP_SYS(fallocate), 240 }, + { SCMP_SYS(fadvise64), 240 }, + { SCMP_SYS(inotify_init1), 240 }, + { SCMP_SYS(inotify_add_watch), 240 } }; int seccomp_start(void) |