{"id":808629,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808629/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170901105818.31956-3-otubo@redhat.com>","date":"2017-09-01T10:58:14","name":"[PATCHv4,2/6] seccomp: add obsolete argument to command line","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"cc44155a285dd68bb8a9436ef2c3b526ca462672","submitter":{"id":71779,"url":"http://patchwork.ozlabs.org/api/1.0/people/71779/?format=json","name":"Eduardo Otubo","email":"otubo@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901105818.31956-3-otubo@redhat.com/mbox/","series":[{"id":999,"url":"http://patchwork.ozlabs.org/api/1.0/series/999/?format=json","date":"2017-09-01T10:58:12","name":"seccomp: feature refactoring","version":1,"mbox":"http://patchwork.ozlabs.org/series/999/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808629/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=otubo@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkGWv2GGLz9s7p\n\tfor ;\n\tFri, 1 Sep 2017 21:01:31 +1000 (AEST)","from localhost ([::1]:35180 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnjhZ-00025V-Bd\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 07:01:29 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51251)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnjey-00008G-Rj\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 06:58:53 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnjet-0001DD-QU\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 06:58:48 -0400","from mx1.redhat.com ([209.132.183.28]:37940)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnjet-0001Cz-IH\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 06:58:43 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 854967E456\n\tfor ; Fri, 1 Sep 2017 10:58:42 +0000 (UTC)","from vader.redhat.com (ovpn-117-156.ams2.redhat.com\n\t[10.36.117.156])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 347A27E8EB;\n\tFri, 1 Sep 2017 10:58:40 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 854967E456","From":"Eduardo Otubo ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 12:58:14 +0200","Message-Id":"<20170901105818.31956-3-otubo@redhat.com>","In-Reply-To":"<20170901105818.31956-1-otubo@redhat.com>","References":"<20170901105818.31956-1-otubo@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tFri, 01 Sep 2017 10:58:42 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCHv4 2/6] seccomp: add obsolete argument to\n\tcommand line","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"thuth@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This patch introduces the argument [,obsolete=allow] to the `-sandbox on'\noption. It allows Qemu to run safely on old system that still relies on\nold system calls.\n\nSigned-off-by: Eduardo Otubo \n---\n include/sysemu/seccomp.h | 3 ++-\n qemu-options.hx | 12 ++++++++++--\n qemu-seccomp.c | 23 ++++++++++++++++++++++-\n vl.c | 22 +++++++++++++++++++++-\n 4 files changed, 55 insertions(+), 5 deletions(-)","diff":"diff --git a/include/sysemu/seccomp.h b/include/sysemu/seccomp.h\nindex 23b9c3c789..215138a372 100644\n--- a/include/sysemu/seccomp.h\n+++ b/include/sysemu/seccomp.h\n@@ -16,8 +16,9 @@\n #define QEMU_SECCOMP_H\n \n #define QEMU_SECCOMP_SET_DEFAULT (1 << 0)\n+#define QEMU_SECCOMP_SET_OBSOLETE (1 << 1)\n \n #include \n \n-int seccomp_start(void);\n+int seccomp_start(uint32_t seccomp_opts);\n #endif\ndiff --git a/qemu-options.hx b/qemu-options.hx\nindex 9f6e2adfff..72150c6b84 100644\n--- a/qemu-options.hx\n+++ b/qemu-options.hx\n@@ -4017,13 +4017,21 @@ Old param mode (ARM only).\n ETEXI\n \n DEF(\"sandbox\", HAS_ARG, QEMU_OPTION_sandbox, \\\n- \"-sandbox Enable seccomp mode 2 system call filter (default 'off').\\n\",\n+ \"-sandbox on[,obsolete=allow|deny]\\n\" \\\n+ \" Enable seccomp mode 2 system call filter (default 'off').\\n\" \\\n+ \" use 'obsolete' to allow obsolete system calls that are provided\\n\" \\\n+ \" by the kernel, but typically no longer used by modern\\n\" \\\n+ \" C library implementations.\\n\",\n QEMU_ARCH_ALL)\n STEXI\n-@item -sandbox @var{arg}\n+@item -sandbox @var{arg}[,obsolete=@var{string}]\n @findex -sandbox\n Enable Seccomp mode 2 system call filter. 'on' will enable syscall filtering and 'off' will\n disable it. The default is 'off'.\n+@table @option\n+@item obsolete=@var{string}\n+Enable Obsolete system calls\n+@end table\n ETEXI\n \n DEF(\"readconfig\", HAS_ARG, QEMU_OPTION_readconfig,\ndiff --git a/qemu-seccomp.c b/qemu-seccomp.c\nindex 585de42a97..3e3f15cc08 100644\n--- a/qemu-seccomp.c\n+++ b/qemu-seccomp.c\n@@ -56,9 +56,22 @@ static const struct QemuSeccompSyscall blacklist[] = {\n { SCMP_SYS(tuxcall), 1, QEMU_SECCOMP_SET_DEFAULT },\n { SCMP_SYS(ulimit), 1, QEMU_SECCOMP_SET_DEFAULT },\n { SCMP_SYS(vserver), 1, QEMU_SECCOMP_SET_DEFAULT },\n+ /* obsolete */\n+ { SCMP_SYS(readdir), 2, QEMU_SECCOMP_SET_OBSOLETE },\n+ { SCMP_SYS(_sysctl), 2, QEMU_SECCOMP_SET_OBSOLETE },\n+ { SCMP_SYS(bdflush), 2, QEMU_SECCOMP_SET_OBSOLETE },\n+ { SCMP_SYS(create_module), 2, QEMU_SECCOMP_SET_OBSOLETE },\n+ { SCMP_SYS(get_kernel_syms), 2, QEMU_SECCOMP_SET_OBSOLETE },\n+ { SCMP_SYS(query_module), 2, QEMU_SECCOMP_SET_OBSOLETE },\n+ { SCMP_SYS(sgetmask), 2, QEMU_SECCOMP_SET_OBSOLETE },\n+ { SCMP_SYS(ssetmask), 2, QEMU_SECCOMP_SET_OBSOLETE },\n+ { SCMP_SYS(sysfs), 2, QEMU_SECCOMP_SET_OBSOLETE },\n+ { SCMP_SYS(uselib), 2, QEMU_SECCOMP_SET_OBSOLETE },\n+ { SCMP_SYS(ustat), 2, QEMU_SECCOMP_SET_OBSOLETE },\n };\n \n-int seccomp_start(void)\n+\n+int seccomp_start(uint32_t seccomp_opts)\n {\n int rc = 0;\n unsigned int i = 0;\n@@ -72,6 +85,14 @@ int seccomp_start(void)\n \n for (i = 0; i < ARRAY_SIZE(blacklist); i++) {\n switch (blacklist[i].set) {\n+ case QEMU_SECCOMP_SET_OBSOLETE:\n+ if (!(seccomp_opts & QEMU_SECCOMP_SET_OBSOLETE)) {\n+ goto add_syscall;\n+ } else {\n+ continue;\n+ }\n+\n+ break;\n default:\n goto add_syscall;\n }\ndiff --git a/vl.c b/vl.c\nindex 305531aba8..ca267f9918 100644\n--- a/vl.c\n+++ b/vl.c\n@@ -271,6 +271,10 @@ static QemuOptsList qemu_sandbox_opts = {\n .name = \"enable\",\n .type = QEMU_OPT_BOOL,\n },\n+ {\n+ .name = \"obsolete\",\n+ .type = QEMU_OPT_STRING,\n+ },\n { /* end of list */ }\n },\n };\n@@ -1032,7 +1036,23 @@ static int parse_sandbox(void *opaque, QemuOpts *opts, Error **errp)\n {\n if (qemu_opt_get_bool(opts, \"enable\", false)) {\n #ifdef CONFIG_SECCOMP\n- if (seccomp_start() < 0) {\n+ uint32_t seccomp_opts = 0x00000;\n+ const char *value = NULL;\n+\n+ value = qemu_opt_get(opts, \"obsolete\");\n+ if (value) {\n+ if (strcmp(value, \"allow\") == 0) {\n+ seccomp_opts |= QEMU_SECCOMP_SET_OBSOLETE;\n+ } else if (strcmp(value, \"deny\")) {\n+ /* this is the default option, this if is here\n+\t\t * to provide a little bit of consistency for\n+\t\t * the command line */\n+\t } else {\n+\t\terror_report(\"invalid argument for obsolete\");\n+\t }\n+ }\n+\n+ if (seccomp_start(seccomp_opts) < 0) {\n error_report(\"failed to install seccomp syscall filter \"\n \"in the kernel\");\n return -1;\n","prefixes":["PATCHv4","2/6"]}