seccomp: fix hole in blocking forks
cover seccomp: fix hole in blocking forks
Blocking the 'fork' syscall on Linux is not sufficient to block the 'fork' C library function, because the latter is essentially always implemented using the 'clone' syscall these days.
Blocking 'clone' is difficult as that also blocks pthread creation, so it needs careful filtering.
Daniel P. Berrangé (5):
seccomp: allow action to be customized per syscall
seccomp: add unit test for seccomp filtering
seccomp: fix blocking of process spawning
seccomp: block use of clone3 syscall
seccomp: block setns, unshare and execveat syscalls
MAINTAINERS | 1 + softmmu/qemu-seccomp.c | 282 +++++++++++++++++++++++++++++--------- tests/unit/meson.build | 4 + tests/unit/test-seccomp.c | 269 ++++++++++++++++++++++++++++++++++++ 4 files changed, 490 insertions(+), 66 deletions(-) create mode 100644 tests/unit/test-seccomp.c
Signature · 1 line
2.31.1
PATCH 1/5 seccomp: allow action to be customized per syscall
We're currently tailoring whether to use kill process or return EPERM based on the syscall set. This is not flexible enough for future requirements where we also need to be able to return a variety of actions on a per-syscall granularity.
--- softmmu/qemu-seccomp.c | 172 +++++++++++++++++++++++++---------------- 1 file changed, 106 insertions(+), 66 deletions(-)
softmmu/qemu-seccomp.c +106 -66
@@ -38,6 +38,7 @@ struct QemuSeccompSyscall {uint8_t set;uint8_t narg;const struct scmp_arg_cmp *arg_cmp; +uint32_t action; };const struct scmp_arg_cmp sched_setscheduler_arg[] = {
@@ -47,61 +48,111 @@ const struct scmp_arg_cmp sched_setscheduler_arg[] = {static const struct QemuSeccompSyscall denylist[] = {/* default set of syscalls that should get blocked */ - {SCMP_SYS (reboot),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (swapon),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (swapoff),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (syslog),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (mount),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (umount),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (kexec_load),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (afs_syscall),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (break),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (ftime),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (getpmsg),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (gtty),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (lock),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (mpx),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (prof),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (profil),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (putpmsg),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (security),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (stty),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (tuxcall),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (ulimit),QEMU_SECCOMP_SET_DEFAULT }, - {SCMP_SYS (vserver),QEMU_SECCOMP_SET_DEFAULT }, + {SCMP_SYS (reboot),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (swapon),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (swapoff),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (syslog),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (mount),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (umount),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (kexec_load),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (afs_syscall),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (break),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (ftime),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (getpmsg),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (gtty),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (lock),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (mpx),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (prof),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (profil),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (putpmsg),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (security),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (stty),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (tuxcall),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (ulimit),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (vserver),QEMU_SECCOMP_SET_DEFAULT , +0 ,NULL ,SCMP_ACT_TRAP },/* obsolete */ - {SCMP_SYS (readdir),QEMU_SECCOMP_SET_OBSOLETE }, - {SCMP_SYS (_sysctl),QEMU_SECCOMP_SET_OBSOLETE }, - {SCMP_SYS (bdflush),QEMU_SECCOMP_SET_OBSOLETE }, - {SCMP_SYS (create_module),QEMU_SECCOMP_SET_OBSOLETE }, - {SCMP_SYS (get_kernel_syms),QEMU_SECCOMP_SET_OBSOLETE }, - {SCMP_SYS (query_module),QEMU_SECCOMP_SET_OBSOLETE }, - {SCMP_SYS (sgetmask),QEMU_SECCOMP_SET_OBSOLETE }, - {SCMP_SYS (ssetmask),QEMU_SECCOMP_SET_OBSOLETE }, - {SCMP_SYS (sysfs),QEMU_SECCOMP_SET_OBSOLETE }, - {SCMP_SYS (uselib),QEMU_SECCOMP_SET_OBSOLETE }, - {SCMP_SYS (ustat),QEMU_SECCOMP_SET_OBSOLETE }, + {SCMP_SYS (readdir),QEMU_SECCOMP_SET_OBSOLETE , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (_sysctl),QEMU_SECCOMP_SET_OBSOLETE , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (bdflush),QEMU_SECCOMP_SET_OBSOLETE , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (create_module),QEMU_SECCOMP_SET_OBSOLETE , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (get_kernel_syms),QEMU_SECCOMP_SET_OBSOLETE , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (query_module),QEMU_SECCOMP_SET_OBSOLETE , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (sgetmask),QEMU_SECCOMP_SET_OBSOLETE , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (ssetmask),QEMU_SECCOMP_SET_OBSOLETE , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (sysfs),QEMU_SECCOMP_SET_OBSOLETE , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (uselib),QEMU_SECCOMP_SET_OBSOLETE , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (ustat),QEMU_SECCOMP_SET_OBSOLETE , +0 ,NULL ,SCMP_ACT_TRAP },/* privileged */ - {SCMP_SYS (setuid),QEMU_SECCOMP_SET_PRIVILEGED }, - {SCMP_SYS (setgid),QEMU_SECCOMP_SET_PRIVILEGED }, - {SCMP_SYS (setpgid),QEMU_SECCOMP_SET_PRIVILEGED }, - {SCMP_SYS (setsid),QEMU_SECCOMP_SET_PRIVILEGED }, - {SCMP_SYS (setreuid),QEMU_SECCOMP_SET_PRIVILEGED }, - {SCMP_SYS (setregid),QEMU_SECCOMP_SET_PRIVILEGED }, - {SCMP_SYS (setresuid),QEMU_SECCOMP_SET_PRIVILEGED }, - {SCMP_SYS (setresgid),QEMU_SECCOMP_SET_PRIVILEGED }, - {SCMP_SYS (setfsuid),QEMU_SECCOMP_SET_PRIVILEGED }, - {SCMP_SYS (setfsgid),QEMU_SECCOMP_SET_PRIVILEGED }, + {SCMP_SYS (setuid),QEMU_SECCOMP_SET_PRIVILEGED , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (setgid),QEMU_SECCOMP_SET_PRIVILEGED , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (setpgid),QEMU_SECCOMP_SET_PRIVILEGED , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (setsid),QEMU_SECCOMP_SET_PRIVILEGED , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (setreuid),QEMU_SECCOMP_SET_PRIVILEGED , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (setregid),QEMU_SECCOMP_SET_PRIVILEGED , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (setresuid),QEMU_SECCOMP_SET_PRIVILEGED , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (setresgid),QEMU_SECCOMP_SET_PRIVILEGED , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (setfsuid),QEMU_SECCOMP_SET_PRIVILEGED , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (setfsgid),QEMU_SECCOMP_SET_PRIVILEGED , +0 ,NULL ,SCMP_ACT_TRAP },/* spawn */ - {SCMP_SYS (fork),QEMU_SECCOMP_SET_SPAWN }, - {SCMP_SYS (vfork),QEMU_SECCOMP_SET_SPAWN }, - {SCMP_SYS (execve),QEMU_SECCOMP_SET_SPAWN }, + {SCMP_SYS (fork),QEMU_SECCOMP_SET_SPAWN , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (vfork),QEMU_SECCOMP_SET_SPAWN , +0 ,NULL ,SCMP_ACT_TRAP }, + {SCMP_SYS (execve),QEMU_SECCOMP_SET_SPAWN , +0 ,NULL ,SCMP_ACT_TRAP },/* resource control */ - {SCMP_SYS (setpriority),QEMU_SECCOMP_SET_RESOURCECTL }, - {SCMP_SYS (sched_setparam),QEMU_SECCOMP_SET_RESOURCECTL }, + {SCMP_SYS (setpriority),QEMU_SECCOMP_SET_RESOURCECTL , +0 ,NULL ,SCMP_ACT_ERRNO (EPERM ) }, + {SCMP_SYS (sched_setparam),QEMU_SECCOMP_SET_RESOURCECTL , +0 ,NULL ,SCMP_ACT_ERRNO (EPERM ) }, {SCMP_SYS (sched_setscheduler),QEMU_SECCOMP_SET_RESOURCECTL , -ARRAY_SIZE (sched_setscheduler_arg), sched_setscheduler_arg }, - {SCMP_SYS (sched_setaffinity),QEMU_SECCOMP_SET_RESOURCECTL }, +ARRAY_SIZE (sched_setscheduler_arg), sched_setscheduler_arg, +SCMP_ACT_ERRNO (EPERM ) }, + {SCMP_SYS (sched_setaffinity),QEMU_SECCOMP_SET_RESOURCECTL , +0 ,NULL ,SCMP_ACT_ERRNO (EPERM ) }, }; static inline __attribute__((unused)) int
@@ -115,15 +166,11 @@ qemu_seccomp(unsigned int operation, unsigned int flags, void *args)#endif } -static uint32_t qemu_seccomp_get_action (int set) +static uint32_t qemu_seccomp_update_action (uint32_t action) { -switch (set) { -case QEMU_SECCOMP_SET_DEFAULT : -case QEMU_SECCOMP_SET_OBSOLETE : -case QEMU_SECCOMP_SET_PRIVILEGED : -case QEMU_SECCOMP_SET_SPAWN : {#if defined(SECCOMP_GET_ACTION_AVAIL ) && defined(SCMP_ACT_KILL_PROCESS ) && \ defined(SECCOMP_RET_KILL_PROCESS ) +if (action ==SCMP_ACT_TRAP ) {static int kill_process =-1 ;if (kill_process ==-1 ) {uint32_t action =SECCOMP_RET_KILL_PROCESS ;
@@ -137,16 +184,9 @@ static uint32_t qemu_seccomp_get_action(int set)if (kill_process ==1 ) {return SCMP_ACT_KILL_PROCESS ; } -#endif -return SCMP_ACT_TRAP ; - } - -case QEMU_SECCOMP_SET_RESOURCECTL : -return SCMP_ACT_ERRNO (EPERM ); - -default : -g_assert_not_reached (); } +#endif +return action; }
@@ -175,7 +215,7 @@ static int seccomp_start(uint32_t seccomp_opts, Error **errp)continue ; } - action =qemu_seccomp_get_action (denylist[i].set); + action =qemu_seccomp_update_action (denylist[i].action); rc =seccomp_rule_add_array (ctx, action, denylist[i].num, denylist[i].narg, denylist[i].arg_cmp);if (rc <0 ) {
Signature · 1 line
2.31.1
PATCH 2/5 seccomp: add unit test for seccomp filtering
In reply to Daniel P. BerrangéThe handling of some syscalls / libc function is quite subtle. For example, 'fork' at a libc level doesn't always correspond to 'fork' at a syscall level, since the 'clone' syscall is preferred usually.
The unit test will help to detect these kind of problems. A point of difficulty in writing a test though is that the QEMU build process may already be confined by seccomp. For example, if running inside a container. Since we can't predict what filtering might have been applied already, we are quite conservative and skip all tests if we see any kind of seccomp filter active.
--- MAINTAINERS | 1 + tests/unit/meson.build | 4 + tests/unit/test-seccomp.c | 270 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 275 insertions(+) create mode 100644 tests/unit/test-seccomp.c
MAINTAINERS +1 -0
@@ -2799,6 +2799,7 @@ M: Eduardo Otubo <[email protected]> S: Supported F: softmmu/qemu-seccomp.c F: include/sysemu/seccomp.h +F: tests/unit/test-seccomp.c Cryptography M: Daniel P. Berrange <[email protected]>
tests/unit/meson.build +4 -0
@@ -51,6 +51,10 @@ if have_system or have_tools tests += { 'test-qmp-event': [testqapi], } + + if seccomp.found() + tests += {'test-seccomp': ['../../softmmu/qemu-seccomp.c', seccomp]} + endif endif if have_block
tests/unit/test-seccomp.c new file +270 -0
270 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 3/5 seccomp: fix blocking of process spawning
In reply to Daniel P. BerrangéWhen '-sandbox on,spawn=deny' is given, we are supposed to block the ability to spawn processes. We naively blocked the 'fork' syscall, forgetting that any modern libc will use the 'clone' syscall instead.
We can't simply block the 'clone' syscall though, as that will break thread creation. We thus list the set of flags used to create threads and block anything that doesn't match this exactly.
--- softmmu/qemu-seccomp.c | 101 ++++++++++++++++++++++++++++++++++++++ tests/unit/test-seccomp.c | 3 +- 2 files changed, 102 insertions(+), 2 deletions(-)
softmmu/qemu-seccomp.c +101 -0
@@ -46,6 +46,82 @@ const struct scmp_arg_cmp sched_setscheduler_arg[] = { { .arg = 1, .op = SCMP_CMP_NE, .datum_a = SCHED_IDLE } }; +/* +* See 'NOTES' in 'man 2 clone' - s390 & cross have 'flags' in +* different position to other architectures +*/ +#if defined(HOST_S390X ) || defined(HOST_S390 ) || defined(HOST_CRIS ) +#define CLONE_FLAGS_ARG 1 +#else +#define CLONE_FLAGS_ARG 0 +#endif + +#ifndef CLONE_PIDFD +# define CLONE_PIDFD 0x00001000 +#endif + +#define REQUIRE_CLONE_FLAG (flag) \ + const struct scmp_arg_cmp clone_arg ## flag[] = { \ + { .arg = CLONE_FLAGS_ARG, \ + .op = SCMP_CMP_MASKED_EQ, \ + .datum_a = flag, .datum_b = 0 } } + +#define FORBID_CLONE_FLAG (flag) \ + const struct scmp_arg_cmp clone_arg ## flag[] = { \ + { .arg = CLONE_FLAGS_ARG, \ + .op = SCMP_CMP_MASKED_EQ, \ + .datum_a = flag, .datum_b = flag } } + +#define RULE_CLONE_FLAG (flag) \ + { SCMP_SYS(clone), QEMU_SECCOMP_SET_SPAWN, \ + ARRAY_SIZE(clone_arg ## flag), clone_arg ## flag, SCMP_ACT_TRAP } + +/* If no CLONE_* flags are set, except CSIGNAL, deny */ +const struct scmp_arg_cmp clone_arg_none[] = { + { .arg =CLONE_FLAGS_ARG , + .op =SCMP_CMP_MASKED_EQ , + .datum_a = ~(CSIGNAL ), .datum_b =0 } +}; + +/* +* pthread_create should always set all of these. +*/ +REQUIRE_CLONE_FLAG (CLONE_VM ); +REQUIRE_CLONE_FLAG (CLONE_FS ); +REQUIRE_CLONE_FLAG (CLONE_FILES ); +REQUIRE_CLONE_FLAG (CLONE_SIGHAND ); +REQUIRE_CLONE_FLAG (CLONE_THREAD ); +REQUIRE_CLONE_FLAG (CLONE_SYSVSEM ); +REQUIRE_CLONE_FLAG (CLONE_SETTLS ); +REQUIRE_CLONE_FLAG (CLONE_PARENT_SETTID ); +REQUIRE_CLONE_FLAG (CLONE_CHILD_CLEARTID ); +/* +* Musl sets this in pthread_create too, but it is +* obsolete and harmless since its behaviour is +* subsumed under CLONE_THREAD +*/ +/*REQUIRE_CLONE_FLAG(CLONE_DETACHED);*/ + + +/* +* These all indicate an attempt to spawn a process +* instead of a thread, or other undesirable scenarios +*/ +FORBID_CLONE_FLAG (CLONE_PIDFD ); +FORBID_CLONE_FLAG (CLONE_PTRACE ); +FORBID_CLONE_FLAG (CLONE_VFORK ); +FORBID_CLONE_FLAG (CLONE_PARENT ); +FORBID_CLONE_FLAG (CLONE_NEWNS ); +FORBID_CLONE_FLAG (CLONE_UNTRACED ); +FORBID_CLONE_FLAG (CLONE_NEWCGROUP ); +FORBID_CLONE_FLAG (CLONE_NEWUTS ); +FORBID_CLONE_FLAG (CLONE_NEWIPC ); +FORBID_CLONE_FLAG (CLONE_NEWUSER ); +FORBID_CLONE_FLAG (CLONE_NEWPID ); +FORBID_CLONE_FLAG (CLONE_NEWNET ); +FORBID_CLONE_FLAG (CLONE_IO ); + +static const struct QemuSeccompSyscall denylist[] = {/* default set of syscalls that should get blocked */ {SCMP_SYS (reboot),QEMU_SECCOMP_SET_DEFAULT ,
@@ -143,6 +219,31 @@ static const struct QemuSeccompSyscall denylist[] = { 0, NULL, SCMP_ACT_TRAP }, {SCMP_SYS (execve),QEMU_SECCOMP_SET_SPAWN , 0, NULL, SCMP_ACT_TRAP }, + { SCMP_SYS(clone), QEMU_SECCOMP_SET_SPAWN, + ARRAY_SIZE(clone_arg_none), clone_arg_none, SCMP_ACT_TRAP }, +RULE_CLONE_FLAG (CLONE_VM ), +RULE_CLONE_FLAG (CLONE_FS ), +RULE_CLONE_FLAG (CLONE_FILES ), +RULE_CLONE_FLAG (CLONE_SIGHAND ), +RULE_CLONE_FLAG (CLONE_THREAD ), +RULE_CLONE_FLAG (CLONE_SYSVSEM ), +RULE_CLONE_FLAG (CLONE_SETTLS ), +RULE_CLONE_FLAG (CLONE_PARENT_SETTID ), +RULE_CLONE_FLAG (CLONE_CHILD_CLEARTID ), +/*RULE_CLONE_FLAG(CLONE_DETACHED),*/ +RULE_CLONE_FLAG (CLONE_PIDFD ), +RULE_CLONE_FLAG (CLONE_PTRACE ), +RULE_CLONE_FLAG (CLONE_VFORK ), +RULE_CLONE_FLAG (CLONE_PARENT ), +RULE_CLONE_FLAG (CLONE_NEWNS ), +RULE_CLONE_FLAG (CLONE_UNTRACED ), +RULE_CLONE_FLAG (CLONE_NEWCGROUP ), +RULE_CLONE_FLAG (CLONE_NEWUTS ), +RULE_CLONE_FLAG (CLONE_NEWIPC ), +RULE_CLONE_FLAG (CLONE_NEWUSER ), +RULE_CLONE_FLAG (CLONE_NEWPID ), +RULE_CLONE_FLAG (CLONE_NEWNET ), +RULE_CLONE_FLAG (CLONE_IO ),/* resource control */ { SCMP_SYS(setpriority), QEMU_SECCOMP_SET_RESOURCECTL, 0, NULL, SCMP_ACT_ERRNO(EPERM) },
tests/unit/test-seccomp.c +1 -2
@@ -126,8 +126,7 @@ static int doit_fork(void)static void test_seccomp_fork_on_nospawn (void ) { -/* XXX fixme - should be killed */ -test_seccomp_passed ("on,spawn=deny" , doit_fork); +test_seccomp_killed ("on,spawn=deny" , doit_fork); }static void test_seccomp_fork_on (void )
Signature · 1 line
2.31.1
PATCH 4/5 seccomp: block use of clone3 syscall
In reply to Daniel P. BerrangéModern glibc will use clone3 instead of clone, when it detects that it is available. We need to compare flags in order to decide whether to allow clone (thread create vs process fork), but in clone3 the flags are hidden inside a struct. Seccomp can't currently match on data inside a struct, so our only option is to block clone3 entirely. If we use ENOSYS to block it, then glibc transparently falls back to clone.
This may need to be revisited if Linux adds a new architecture in future and only provides clone3, without clone.
--- softmmu/qemu-seccomp.c | 4 ++++ 1 file changed, 4 insertions(+)
softmmu/qemu-seccomp.c +4 -0
@@ -244,6 +244,10 @@ static const struct QemuSeccompSyscall denylist[] = {RULE_CLONE_FLAG (CLONE_NEWPID ),RULE_CLONE_FLAG (CLONE_NEWNET ),RULE_CLONE_FLAG (CLONE_IO ), +#ifdef __SNR_clone3 + { SCMP_SYS(clone3), QEMU_SECCOMP_SET_SPAWN, + 0, NULL, SCMP_ACT_ERRNO(ENOSYS) }, +#endif /* resource control */ { SCMP_SYS(setpriority), QEMU_SECCOMP_SET_RESOURCECTL, 0, NULL, SCMP_ACT_ERRNO(EPERM) },
Signature · 1 line
2.31.1
PATCH 5/5 seccomp: block setns, unshare and execveat syscalls
In reply to Daniel P. Berrangésetns/unshare are used to change namespaces which is not something QEMU needs to be able todo.
execveat is a new variant of execve so should be blocked just like execve already is.
--- softmmu/qemu-seccomp.c | 5 +++++ 1 file changed, 5 insertions(+)
softmmu/qemu-seccomp.c +5 -0
@@ -248,6 +248,11 @@ static const struct QemuSeccompSyscall denylist[] = { { SCMP_SYS(clone3), QEMU_SECCOMP_SET_SPAWN, 0, NULL, SCMP_ACT_ERRNO(ENOSYS) }, #endif +#ifdef __SNR_execveat + { SCMP_SYS(execveat), QEMU_SECCOMP_SET_SPAWN }, +#endif + { SCMP_SYS(setns), QEMU_SECCOMP_SET_SPAWN }, + { SCMP_SYS(unshare), QEMU_SECCOMP_SET_SPAWN }, /* resource control */ { SCMP_SYS(setpriority), QEMU_SECCOMP_SET_RESOURCECTL, 0, NULL, SCMP_ACT_ERRNO(EPERM) },
Signature · 1 line
2.31.1
Quoted 14 lines · Daniel P. Berrangé
Blocking the 'fork' syscall on Linux is not sufficient to block the 'fork' C library function, because the latter is essentially always implemented using the 'clone' syscall these days.
Blocking 'clone' is difficult as that also blocks pthread creation, so it needs careful filtering.
Daniel P. Berrangé (5):
seccomp: allow action to be customized per syscall
seccomp: add unit test for seccomp filtering
seccomp: fix blocking of process spawning
seccomp: block use of clone3 syscall
seccomp: block setns, unshare and execveat syscalls
Quoted 12 lines
MAINTAINERS | 1 +
softmmu/qemu-seccomp.c | 282 +++++++++++++++++++++++++++++------- --
tests/unit/meson.build | 4 +tests/unit/test-seccomp.c| 269 ++++++++++++++++++++++++++++++++++++4 files changed, 490 insertions(+), 66 deletions(-)create mode 100644
tests/unit/test-seccomp.cSignature · 1 line
2.31.1
Signature · 1 line
Eduardo Otubo
Hi Eduardo,
You acked this series, but going through my old git branches I just discovered that this never got merged. I guess I was assuming you had queued it for a future PULL when you acked it.
I don't mind sending a pull request myself if you've no objections.
Quoted 23 lines · Eduardo Terrell Ferrari Otubo
Quoted 22 lines · Daniel P. Berrangé
Blocking the 'fork' syscall on Linux is not sufficient to block the 'fork' C library function, because the latter is essentially always implemented using the 'clone' syscall these days.
Blocking 'clone' is difficult as that also blocks pthread creation, so it needs careful filtering.
Daniel P. Berrangé (5):
seccomp: allow action to be customized per syscall
seccomp: add unit test for seccomp filtering
seccomp: fix blocking of process spawning
seccomp: block use of clone3 syscall
seccomp: block setns, unshare and execveat syscallsMAINTAINERS | 1 +
softmmu/qemu-seccomp.c | 282 +++++++++++++++++++++++++++++------- --
tests/unit/meson.build | 4 +tests/unit/test-seccomp.c| 269 ++++++++++++++++++++++++++++++++++++4 files changed, 490 insertions(+), 66 deletions(-)create mode 100644
tests/unit/test-seccomp.c
Quoted 11 lines
Quoted 4 lines
Signature · 1 line
2.31.1Acked-by Eduardo Otubo <[email protected]>Signature · 1 line
Eduardo Otubo
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 8 lines · Daniel P. Berrangé
Hi Eduardo,
You acked this series, but going through my old git branches I just discovered that this never got merged. I guess I was assuming you had queued it for a future PULL when you acked it.
I don't mind sending a pull request myself if you've no objections.
I don't mind at all. Thanks for letting me know! I might have missed it somehow.
Thank you!
Quoted 46 lines · Eduardo Terrell Ferrari Otubo
Quoted 28 lines · Daniel P. Berrangé
Quoted 22 lines
Blocking the 'fork' syscall on Linux is not sufficient to block the 'fork' C library function, because the latter is essentially always implemented using the 'clone' syscall these days.
Blocking 'clone' is difficult as that also blocks pthread creation, so it needs careful filtering.
Daniel P. Berrangé (5):
seccomp: allow action to be customized per syscall
seccomp: add unit test for seccomp filtering
seccomp: fix blocking of process spawning
seccomp: block use of clone3 syscall
seccomp: block setns, unshare and execveat syscallsMAINTAINERS | 1 + softmmu/qemu-seccomp.c | 282 +++++++++++++++++++++++++++++------- -- tests/unit/meson.build | 4 + tests/unit/test-seccomp.c | 269 ++++++++++++++++++++++++++++++++++++ 4 files changed, 490 insertions(+), 66 deletions(-) create mode 100644 tests/unit/test-seccomp.cQuoted 4 lines
--
2.31.1Quoted 6 lines
Acked-by Eduardo Otubo <[email protected]>--
Eduardo OtuboRegards,
Daniel
--|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 11 lines · Eduardo Otubo
Quoted 8 lines · Daniel P. Berrangé
Hi Eduardo,
You acked this series, but going through my old git branches I just discovered that this never got merged. I guess I was assuming you had queued it for a future PULL when you acked it.
I don't mind sending a pull request myself if you've no objections.
I don't mind at all. Thanks for letting me know! I might have missed it somehow.
Ok, I'll send it, since I have some other unrelated stuff needing sending too.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|