ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

seccomp branch queue 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUqscNAAoJEP0M/1sS+L0v1BgH/Ay4OH3eXmuG8gSYhc9jHYzA
 8Cpu8L4p4hl+eb1ijANGvpyc5noVxf4l/H9yyGaTG8aiE7HBR6fedA+Xk6FaKyYh
 plYhzcL60lm+/UphAtxBYmV66+V+Nz8DZxh/jgsIIw5wadXs6CE3RgdHokYoR7hn
 E0s8/g6hCVGD23GDltq9idpGjZDRfZSN8g2DsF6VQ8Gyg0nSlAlsBNh6jQzHZV1y
 I/8pcwjAHhI/9645DGUQOkKuhd3U/dJAyzrLU4VHZcImjvFP8Hmcmj0ZeSYmsPY4
 uFdbTjiiv4a7TL2Ek4bZbzhdN7SZyvvVYbT3QiIVS5umP9DtgyOhgRITxeG0Amo=
 =WT8L
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2015-01-10 19:06:41 +00:00
parent f1c5831ca3 ea259acae5
commit e77d927f1a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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

3
qemu-seccomp.c
View File

@ -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)