diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-10 19:06:41 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-10 19:06:41 +0000 |
| commit | e77d927f1a1876ef341b4df287939b0c935703d5 (patch) | |
| tree | 486a2b8ffabb07cfce1511f31883e6a0c4cfc05f | |
| parent | f1c5831ca3e3eafb89331233221768b64db113e8 (diff) | |
| parent | ea259acae5b2d88ee6e92caf1cf44eb501eaef47 (diff) | |
Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20150105' into staging
seccomp branch queue
# gpg: Signature made Mon 05 Jan 2015 17:17:01 GMT using RSA key ID 12F8BD2F
# gpg: Can't check signature: public key not found
* remotes/otubo/tags/pull-seccomp-20150105:
seccomp: add mbind() to the syscall whitelist
seccomp: typo in configure error message
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | qemu-seccomp.c | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -1830,7 +1830,7 @@ if test "$seccomp" != "no" ; then seccomp="yes" else if test "$seccomp" = "yes"; then - feature_not_found "libseccomp" "Install libseccomp devel >= 2.1.0" + feature_not_found "libseccomp" "Install libseccomp devel >= 2.1.1" fi seccomp="no" fi diff --git a/qemu-seccomp.c b/qemu-seccomp.c index af6a375127..b0c626984f 100644 --- a/qemu-seccomp.c +++ b/qemu-seccomp.c @@ -235,7 +235,8 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = { { SCMP_SYS(fallocate), 240 }, { SCMP_SYS(fadvise64), 240 }, { SCMP_SYS(inotify_init1), 240 }, - { SCMP_SYS(inotify_add_watch), 240 } + { SCMP_SYS(inotify_add_watch), 240 }, + { SCMP_SYS(mbind), 240 } }; int seccomp_start(void) |