|
 |
9ae3a8 |
From 77b56ef5c4488f32151018c06443c701d6173ce7 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Paul Moore <pmoore@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 20 Dec 2013 21:43:16 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 04/16] seccomp: exit if seccomp_init() fails
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Paul Moore <pmoore@redhat.com>
|
|
|
9ae3a8 |
Message-id: <20131220214316.2542.64440.stgit@localhost>
|
|
|
9ae3a8 |
Patchwork-id: 56418
|
|
|
9ae3a8 |
O-Subject: [RHEL7 qemu-kvm PATCH] seccomp: exit if seccomp_init() fails
|
|
|
9ae3a8 |
Bugzilla: 1044845
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Corey Bryant <coreyb@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1044845
|
|
|
9ae3a8 |
Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=6770015
|
|
|
9ae3a8 |
Upstream: merged into the QEMU seccomp tree
|
|
|
9ae3a8 |
git://github.com/otubo/qemu.git seccomp
|
|
|
9ae3a8 |
Testing: Tested by IBM, see BZ
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
seccomp: exit if seccomp_init() fails
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This fixes a bug where we weren't exiting if seccomp_init() failed.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
Acked-by: Eduardo Otubo <otubo@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
Acked-by: Paul Moore <pmoore@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 2a13f991123fa16841e6d94b02a9cc2c76d91725)
|
|
|
9ae3a8 |
Signed-off-by: Paul Moore <pmoore@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qemu-seccomp.c | 1 +
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qemu-seccomp.c | 1 +
|
|
|
9ae3a8 |
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/qemu-seccomp.c b/qemu-seccomp.c
|
|
|
9ae3a8 |
index 906101f..fc48bdd 100644
|
|
|
9ae3a8 |
--- a/qemu-seccomp.c
|
|
|
9ae3a8 |
+++ b/qemu-seccomp.c
|
|
|
9ae3a8 |
@@ -248,6 +248,7 @@ int seccomp_start(void)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
ctx = seccomp_init(SCMP_ACT_KILL);
|
|
|
9ae3a8 |
if (ctx == NULL) {
|
|
|
9ae3a8 |
+ rc = -1;
|
|
|
9ae3a8 |
goto seccomp_return;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|