cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-seccomp-add-timerfd_create-and-timerfd_settime-to-th.patch

05bba0
From 982a3d6d0569bed08ee7d31380271abe69d836b4 Mon Sep 17 00:00:00 2001
05bba0
From: Gerd Hoffmann <kraxel@redhat.com>
05bba0
Date: Thu, 30 Apr 2015 10:31:57 +0200
05bba0
Subject: [PATCH 1/4] seccomp: add timerfd_create and timerfd_settime to the
05bba0
 whitelist
05bba0
05bba0
Message-id: <1430389917-29237-2-git-send-email-kraxel@redhat.com>
05bba0
Patchwork-id: 64959
05bba0
O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/1] seccomp: add timerfd_create and timerfd_settime to the whitelist
05bba0
Bugzilla: 1185737
05bba0
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
05bba0
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
05bba0
05bba0
From: Felix Geyer <debfx@fobos.de>
05bba0
05bba0
libusb calls timerfd_create() and timerfd_settime() when it's built with
05bba0
timerfd support.
05bba0
05bba0
Command to reproduce:
05bba0
05bba0
       -device usb-host,hostbus=1,hostaddr=3,id=hostdev0
05bba0
05bba0
Log messages:
05bba0
05bba0
audit(1390730418.924:135): auid=4294967295 uid=121 gid=103 ses=4294967295
05bba0
                           pid=5232 comm="qemu-system-x86" sig=31 syscall=283
05bba0
                           compat=0 ip=0x7f2b0f4e96a7 code=0x0
05bba0
audit(1390733100.580:142): auid=4294967295 uid=121 gid=103 ses=4294967295
05bba0
                           pid=16909 comm="qemu-system-x86" sig=31 syscall=286
05bba0
                           compat=0 ip=0x7f03513a06da code=0x0
05bba0
05bba0
Reading a few hundred MB from a USB drive on x86_64 shows this syscall distribution.
05bba0
Therefore the timerfd_settime priority is set to 242.
05bba0
05bba0
    calls  syscall
05bba0
 --------- ----------------
05bba0
   5303600 write
05bba0
   2240554 read
05bba0
   2167030 ppoll
05bba0
   2134828 ioctl
05bba0
    704023 timerfd_settime
05bba0
    689105 poll
05bba0
     83122 futex
05bba0
       803 writev
05bba0
       476 rt_sigprocmask
05bba0
       287 recvmsg
05bba0
       178 brk
05bba0
05bba0
Signed-off-by: Felix Geyer <debfx@fobos.de>
05bba0
Signed-off-by: Eduardo Otubo <otubo@linux.vnet.ibm.com>
05bba0
(cherry picked from commit 84397618529f920bea45d0bab22ec097766244fc)
05bba0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
05bba0
Conflicts:
05bba0
	qemu-seccomp.c
05bba0
---
05bba0
 qemu-seccomp.c | 4 +++-
05bba0
 1 file changed, 3 insertions(+), 1 deletion(-)
05bba0
---
05bba0
 qemu-seccomp.c | 4 +++-
05bba0
 1 file changed, 3 insertions(+), 1 deletion(-)
05bba0
05bba0
diff --git a/qemu-seccomp.c b/qemu-seccomp.c
05bba0
index 59cae8e..5e60fce 100644
05bba0
--- a/qemu-seccomp.c
05bba0
+++ b/qemu-seccomp.c
05bba0
@@ -154,6 +154,7 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
05bba0
     { SCMP_SYS(getsockname), 242 },
05bba0
     { SCMP_SYS(getpeername), 242 },
05bba0
     { SCMP_SYS(accept4), 242 },
05bba0
+    { SCMP_SYS(timerfd_settime), 242 },
05bba0
     { SCMP_SYS(newfstatat), 241 },
05bba0
     { SCMP_SYS(shutdown), 241 },
05bba0
     { SCMP_SYS(getsockopt), 241 },
05bba0
@@ -246,7 +247,8 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
05bba0
     { SCMP_SYS(shmctl), 240 },
05bba0
     { SCMP_SYS(mlock), 240 },
05bba0
     { SCMP_SYS(munlock), 240 },
05bba0
-    { SCMP_SYS(semctl), 240 }
05bba0
+    { SCMP_SYS(semctl), 240 },
05bba0
+    { SCMP_SYS(timerfd_create), 240 },
05bba0
 };
05bba0
 
05bba0
 int seccomp_start(void)
05bba0
-- 
05bba0
1.8.3.1
05bba0