diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-15 13:05:11 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-15 13:05:11 +0100 |
| commit | 6c938efc27c2c9c9b02d574d0522a83dc06c72c8 (patch) | |
| tree | 660f5f400ee22a7822b2bc2f6b7292681803303c | |
| parent | 9b14671aec0a1dd9472f260f2482409c71f0e24d (diff) | |
| parent | e474e3aacf4276eb0781d11c45e2fab996f9dc56 (diff) | |
| download | qemu-6c938efc27c2c9c9b02d574d0522a83dc06c72c8.zip qemu-6c938efc27c2c9c9b02d574d0522a83dc06c72c8.tar.gz qemu-6c938efc27c2c9c9b02d574d0522a83dc06c72c8.tar.bz2 | |
Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20200915' into staging
seccomp branch queue
# gpg: Signature made Tue 15 Sep 2020 11:58:27 BST
# gpg: using RSA key D67E1B50937486B40723DBABDF32E7C0F0FFF9A2
# gpg: issuer "otubo@redhat.com"
# gpg: Good signature from "Eduardo Otubo (Senior Software Engineer) <otubo@redhat.com>" [full]
# Primary key fingerprint: D67E 1B50 9374 86B4 0723 DBAB DF32 E7C0 F0FF F9A2
* remotes/otubo/tags/pull-seccomp-20200915:
seccomp: fix killing of whole process instead of thread
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | qemu-seccomp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qemu-seccomp.c b/qemu-seccomp.c index e0a1829..8325ecb 100644 --- a/qemu-seccomp.c +++ b/qemu-seccomp.c @@ -136,8 +136,9 @@ static uint32_t qemu_seccomp_get_action(int set) if (qemu_seccomp(SECCOMP_GET_ACTION_AVAIL, 0, &action) == 0) { kill_process = 1; + } else { + kill_process = 0; } - kill_process = 0; } if (kill_process == 1) { return SCMP_ACT_KILL_PROCESS; |