Commit 567ea808 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20180926' into staging 



pull-seccomp-20180926

# gpg: Signature made Wed 26 Sep 2018 14:20:06 BST
# gpg:                using RSA key DF32E7C0F0FFF9A2
# gpg: Good signature from "Eduardo Otubo (Senior Software Engineer) <otubo@redhat.com>"
# Primary key fingerprint: D67E 1B50 9374 86B4 0723  DBAB DF32 E7C0 F0FF F9A2

* remotes/otubo/tags/pull-seccomp-20180926:
  seccomp: check TSYNC host capability

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 099bea11 5780760f

qemu-seccomp.c

+18 −1
Original line number Diff line number Diff line
@@ -282,7 +282,24 @@ static QemuOptsList qemu_sandbox_opts = { 


static void seccomp_register(void)

{

    bool add = false;



    /* FIXME: use seccomp_api_get() >= 2 check when released */



#if defined(SECCOMP_FILTER_FLAG_TSYNC)

    int check;



    /* check host TSYNC capability, it returns errno == ENOSYS if unavailable */

    check = qemu_seccomp(SECCOMP_SET_MODE_FILTER,

                         SECCOMP_FILTER_FLAG_TSYNC, NULL);

    if (check < 0 && errno == EFAULT) {

        add = true;

    }

#endif



    if (add) {

        qemu_add_opts(&qemu_sandbox_opts);

    }

}

opts_init(seccomp_register);

#endif

vl.c

+2 −2
Original line number Diff line number Diff line
@@ -3917,8 +3917,8 @@ int main(int argc, char **argv, char **envp) 
    }



#ifdef CONFIG_SECCOMP

    if (qemu_opts_foreach(qemu_find_opts("sandbox"),

                          parse_sandbox, NULL, NULL)) {

    olist = qemu_find_opts_err("sandbox", NULL);

    if (olist && qemu_opts_foreach(olist, parse_sandbox, NULL, NULL)) {

        exit(1);

    }

#endif