Commit e77d927f authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f1c5831c ea259aca

configure

+1 −1
Original line number Diff line number Diff line
@@ -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

qemu-seccomp.c

+2 −1
Original line number Diff line number Diff line
@@ -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)