03843ca13d
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.12 * Patches added: 0067-seccomp-allow-sched_setscheduler-wi.patch - Fixing seccomp resourcecontrol defunct issue (bsc#1102627) - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.12 * Patches added: 0067-seccomp-allow-sched_setscheduler-wi.patch - Fixing seccomp resourcecontrol defunct issue (bsc#1102627) - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.12 * Patches added: 0067-seccomp-allow-sched_setscheduler-wi.patch OBS-URL: https://build.opensuse.org/request/show/625450 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=418
66 lines
2.6 KiB
Diff
66 lines
2.6 KiB
Diff
From 88a1488c572c681f9737bd3e3ae24e9a3c936212 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
Date: Tue, 10 Jul 2018 16:55:57 +0200
|
|
Subject: [PATCH] seccomp: allow sched_setscheduler() with SCHED_IDLE policy
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Current and upcoming mesa releases rely on a shader disk cash. It uses
|
|
a thread job queue with low priority, set with
|
|
sched_setscheduler(SCHED_IDLE). However, that syscall is rejected by
|
|
the "resourcecontrol" seccomp qemu filter.
|
|
|
|
Since it should be safe to allow lowering thread priority, let's allow
|
|
scheduling thread to idle policy.
|
|
|
|
Related to:
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1594456
|
|
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Acked-by: Eduardo Otubo <otubo@redhat.com>
|
|
(cherry picked from commit 056de1e894155fbb99e7b43c1c4382d4920cf437)
|
|
[LD: BSD#1102627]
|
|
Signed-off-by: Larry Dewey <ldewey@suse.com>
|
|
---
|
|
qemu-seccomp.c | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/qemu-seccomp.c b/qemu-seccomp.c
|
|
index b770a77d33..845a3330df 100644
|
|
--- a/qemu-seccomp.c
|
|
+++ b/qemu-seccomp.c
|
|
@@ -29,6 +29,12 @@
|
|
struct QemuSeccompSyscall {
|
|
int32_t num;
|
|
uint8_t set;
|
|
+ uint8_t narg;
|
|
+ const struct scmp_arg_cmp *arg_cmp;
|
|
+};
|
|
+
|
|
+const struct scmp_arg_cmp sched_setscheduler_arg[] = {
|
|
+ SCMP_A1(SCMP_CMP_NE, SCHED_IDLE)
|
|
};
|
|
|
|
static const struct QemuSeccompSyscall blacklist[] = {
|
|
@@ -87,7 +93,8 @@ static const struct QemuSeccompSyscall blacklist[] = {
|
|
{ SCMP_SYS(setpriority), QEMU_SECCOMP_SET_RESOURCECTL },
|
|
{ SCMP_SYS(sched_setparam), QEMU_SECCOMP_SET_RESOURCECTL },
|
|
{ SCMP_SYS(sched_getparam), QEMU_SECCOMP_SET_RESOURCECTL },
|
|
- { SCMP_SYS(sched_setscheduler), QEMU_SECCOMP_SET_RESOURCECTL },
|
|
+ { SCMP_SYS(sched_setscheduler), QEMU_SECCOMP_SET_RESOURCECTL,
|
|
+ ARRAY_SIZE(sched_setscheduler_arg), sched_setscheduler_arg },
|
|
{ SCMP_SYS(sched_getscheduler), QEMU_SECCOMP_SET_RESOURCECTL },
|
|
{ SCMP_SYS(sched_setaffinity), QEMU_SECCOMP_SET_RESOURCECTL },
|
|
{ SCMP_SYS(sched_getaffinity), QEMU_SECCOMP_SET_RESOURCECTL },
|
|
@@ -113,7 +120,8 @@ int seccomp_start(uint32_t seccomp_opts)
|
|
continue;
|
|
}
|
|
|
|
- rc = seccomp_rule_add(ctx, SCMP_ACT_KILL, blacklist[i].num, 0);
|
|
+ rc = seccomp_rule_add_array(ctx, SCMP_ACT_KILL, blacklist[i].num,
|
|
+ blacklist[i].narg, blacklist[i].arg_cmp);
|
|
if (rc < 0) {
|
|
goto seccomp_return;
|
|
}
|