diff mbox

[PULL,01/02] seccomp: add timerfd_create and timerfd_settime to the whitelist

Message ID 1397498460-21829-2-git-send-email-otubo@linux.vnet.ibm.com
State New
Headers show

Commit Message

Eduardo Otubo April 14, 2014, 6 p.m. UTC
From: Felix Geyer <debfx@fobos.de>

libusb calls timerfd_create() and timerfd_settime() when it's built with
timerfd support.

Command to reproduce:

       -device usb-host,hostbus=1,hostaddr=3,id=hostdev0

Log messages:

audit(1390730418.924:135): auid=4294967295 uid=121 gid=103 ses=4294967295
                           pid=5232 comm="qemu-system-x86" sig=31 syscall=283
                           compat=0 ip=0x7f2b0f4e96a7 code=0x0
audit(1390733100.580:142): auid=4294967295 uid=121 gid=103 ses=4294967295
                           pid=16909 comm="qemu-system-x86" sig=31 syscall=286
                           compat=0 ip=0x7f03513a06da code=0x0

Reading a few hundred MB from a USB drive on x86_64 shows this syscall distribution.
Therefore the timerfd_settime priority is set to 242.

    calls  syscall
 --------- ----------------
   5303600 write
   2240554 read
   2167030 ppoll
   2134828 ioctl
    704023 timerfd_settime
    689105 poll
     83122 futex
       803 writev
       476 rt_sigprocmask
       287 recvmsg
       178 brk

Signed-off-by: Felix Geyer <debfx@fobos.de>
Signed-off-by: Eduardo Otubo <otubo@linux.vnet.ibm.com>
Acked-by: Eduardo Otubo <otubo@linux.vnet.ibm.com>
---
 qemu-seccomp.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Comments

Eduardo Otubo April 22, 2014, 1:56 p.m. UTC | #1
On 04/14/2014 03:00 PM, Eduardo Otubo wrote:
> From: Felix Geyer <debfx@fobos.de>
>
> libusb calls timerfd_create() and timerfd_settime() when it's built with
> timerfd support.
>
> Command to reproduce:
>
>         -device usb-host,hostbus=1,hostaddr=3,id=hostdev0
>
> Log messages:
>
> audit(1390730418.924:135): auid=4294967295 uid=121 gid=103 ses=4294967295
>                             pid=5232 comm="qemu-system-x86" sig=31 syscall=283
>                             compat=0 ip=0x7f2b0f4e96a7 code=0x0
> audit(1390733100.580:142): auid=4294967295 uid=121 gid=103 ses=4294967295
>                             pid=16909 comm="qemu-system-x86" sig=31 syscall=286
>                             compat=0 ip=0x7f03513a06da code=0x0
>
> Reading a few hundred MB from a USB drive on x86_64 shows this syscall distribution.
> Therefore the timerfd_settime priority is set to 242.
>
>      calls  syscall
>   --------- ----------------
>     5303600 write
>     2240554 read
>     2167030 ppoll
>     2134828 ioctl
>      704023 timerfd_settime
>      689105 poll
>       83122 futex
>         803 writev
>         476 rt_sigprocmask
>         287 recvmsg
>         178 brk
>
> Signed-off-by: Felix Geyer <debfx@fobos.de>
> Signed-off-by: Eduardo Otubo <otubo@linux.vnet.ibm.com>

Sorry, Peter, you mean this one?
Should I remove Acked-by? I had other patches with Acked-by merged with 
no problems before.

Regards,

> Acked-by: Eduardo Otubo <otubo@linux.vnet.ibm.com>
> ---
>   qemu-seccomp.c |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/qemu-seccomp.c b/qemu-seccomp.c
> index caa926e..46554bd 100644
> --- a/qemu-seccomp.c
> +++ b/qemu-seccomp.c
> @@ -143,6 +143,7 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
>       { SCMP_SYS(getsockname), 242 },
>       { SCMP_SYS(getpeername), 242 },
>       { SCMP_SYS(accept4), 242 },
> +    { SCMP_SYS(timerfd_settime), 242 },
>       { SCMP_SYS(newfstatat), 241 },
>       { SCMP_SYS(shutdown), 241 },
>       { SCMP_SYS(getsockopt), 241 },
> @@ -225,7 +226,8 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {
>       { SCMP_SYS(fchmod), 240 },
>       { SCMP_SYS(shmget), 240 },
>       { SCMP_SYS(shmat), 240 },
> -    { SCMP_SYS(shmdt), 240 }
> +    { SCMP_SYS(shmdt), 240 },
> +    { SCMP_SYS(timerfd_create), 240 }
>   };
>
>   int seccomp_start(void)
>
Peter Maydell April 22, 2014, 2:17 p.m. UTC | #2
On 22 April 2014 14:56, Eduardo Otubo <otubo@linux.vnet.ibm.com> wrote:
>
>
> On 04/14/2014 03:00 PM, Eduardo Otubo wrote:
>>
>> From: Felix Geyer <debfx@fobos.de>
>>
>> libusb calls timerfd_create() and timerfd_settime() when it's built with
>> timerfd support.
>>
>> Command to reproduce:
>>
>>         -device usb-host,hostbus=1,hostaddr=3,id=hostdev0
>>
>> Log messages:
>>
>> audit(1390730418.924:135): auid=4294967295 uid=121 gid=103 ses=4294967295
>>                             pid=5232 comm="qemu-system-x86" sig=31
>> syscall=283
>>                             compat=0 ip=0x7f2b0f4e96a7 code=0x0
>> audit(1390733100.580:142): auid=4294967295 uid=121 gid=103 ses=4294967295
>>                             pid=16909 comm="qemu-system-x86" sig=31
>> syscall=286
>>                             compat=0 ip=0x7f03513a06da code=0x0
>>
>> Reading a few hundred MB from a USB drive on x86_64 shows this syscall
>> distribution.
>> Therefore the timerfd_settime priority is set to 242.
>>
>>      calls  syscall
>>   --------- ----------------
>>     5303600 write
>>     2240554 read
>>     2167030 ppoll
>>     2134828 ioctl
>>      704023 timerfd_settime
>>      689105 poll
>>       83122 futex
>>         803 writev
>>         476 rt_sigprocmask
>>         287 recvmsg
>>         178 brk
>>
>> Signed-off-by: Felix Geyer <debfx@fobos.de>
>> Signed-off-by: Eduardo Otubo <otubo@linux.vnet.ibm.com>
>
>
> Sorry, Peter, you mean this one?
> Should I remove Acked-by? I had other patches with Acked-by merged with no
> problems before.

The patches you sent by email had signed-off-by tags but the git tree
your pull request pointed to did not have them. That discrepancy
indicates that something in your workflow needs fixing...

Patches in pull requests you send should have your signed-off-by
tag because this indicates that they have passed through your hands
and you think they are OK to apply.

thanks
-- PMM
Andreas Färber April 22, 2014, 4:17 p.m. UTC | #3
Am 22.04.2014 15:56, schrieb Eduardo Otubo:
> 
> 
> On 04/14/2014 03:00 PM, Eduardo Otubo wrote:
>> Signed-off-by: Felix Geyer <debfx@fobos.de>
>> Signed-off-by: Eduardo Otubo <otubo@linux.vnet.ibm.com>
> 
> Sorry, Peter, you mean this one?
> Should I remove Acked-by? I had other patches with Acked-by merged with
> no problems before.

Apart from the issue of the Git tree [1] diverging from the patches,
your Signed-off-by should be last. There's nothing particularly wrong
with Acked-by otherwise, except that it's not adding any information
over Signed-off-by, and when used last may cause confusion.

Cheers,
Andreas

[1] https://github.com/otubo/qemu/commits/seccomp
diff mbox

Patch

diff --git a/qemu-seccomp.c b/qemu-seccomp.c
index caa926e..46554bd 100644
--- a/qemu-seccomp.c
+++ b/qemu-seccomp.c
@@ -143,6 +143,7 @@  static const struct QemuSeccompSyscall seccomp_whitelist[] = {
     { SCMP_SYS(getsockname), 242 },
     { SCMP_SYS(getpeername), 242 },
     { SCMP_SYS(accept4), 242 },
+    { SCMP_SYS(timerfd_settime), 242 },
     { SCMP_SYS(newfstatat), 241 },
     { SCMP_SYS(shutdown), 241 },
     { SCMP_SYS(getsockopt), 241 },
@@ -225,7 +226,8 @@  static const struct QemuSeccompSyscall seccomp_whitelist[] = {
     { SCMP_SYS(fchmod), 240 },
     { SCMP_SYS(shmget), 240 },
     { SCMP_SYS(shmat), 240 },
-    { SCMP_SYS(shmdt), 240 }
+    { SCMP_SYS(shmdt), 240 },
+    { SCMP_SYS(timerfd_create), 240 }
 };
 
 int seccomp_start(void)