From: Eduardo Otubo <otubo@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 2/6] seccomp: add obsolete argument to command line
Date: Fri, 21 Jul 2017 14:52:31 +0200 [thread overview]
Message-ID: <20170721125235.11939-3-otubo@redhat.com> (raw)
In-Reply-To: <20170721125235.11939-1-otubo@redhat.com>
This patch introduces the argument [,obsolete=allow] to the `-sandbox on'
option. It allows Qemu to run safely on old system that still relies on
old system calls.
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
---
include/sysemu/seccomp.h | 4 +++-
qemu-options.hx | 9 +++++++--
qemu-seccomp.c | 32 +++++++++++++++++++++++++++++++-
vl.c | 16 +++++++++++++++-
4 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/include/sysemu/seccomp.h b/include/sysemu/seccomp.h
index cfc06008cb..7a7bde246b 100644
--- a/include/sysemu/seccomp.h
+++ b/include/sysemu/seccomp.h
@@ -15,7 +15,9 @@
#ifndef QEMU_SECCOMP_H
#define QEMU_SECCOMP_H
+#define OBSOLETE 0x0001
+
#include <seccomp.h>
-int seccomp_start(void);
+int seccomp_start(uint8_t seccomp_opts);
#endif
diff --git a/qemu-options.hx b/qemu-options.hx
index 746b5fa75d..54e492f36a 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4004,13 +4004,18 @@ Old param mode (ARM only).
ETEXI
DEF("sandbox", HAS_ARG, QEMU_OPTION_sandbox, \
- "-sandbox <arg> Enable seccomp mode 2 system call filter (default 'off').\n",
+ "-sandbox on[,obsolete=allow] Enable seccomp mode 2 system call filter (default 'off').\n" \
+ " obsolete: Allow obsolete system calls\n",
QEMU_ARCH_ALL)
STEXI
-@item -sandbox @var{arg}
+@item -sandbox @var{arg}[,obsolete=@var{string}]
@findex -sandbox
Enable Seccomp mode 2 system call filter. 'on' will enable syscall filtering and 'off' will
disable it. The default is 'off'.
+@table @option
+@item obsolete=@var{string}
+Enable Obsolete system calls
+@end table
ETEXI
DEF("readconfig", HAS_ARG, QEMU_OPTION_readconfig,
diff --git a/qemu-seccomp.c b/qemu-seccomp.c
index f8877b07b5..c6a8b28260 100644
--- a/qemu-seccomp.c
+++ b/qemu-seccomp.c
@@ -31,6 +31,20 @@ struct QemuSeccompSyscall {
uint8_t priority;
};
+static const struct QemuSeccompSyscall obsolete[] = {
+ { SCMP_SYS(readdir), 255 },
+ { SCMP_SYS(_sysctl), 255 },
+ { SCMP_SYS(bdflush), 255 },
+ { SCMP_SYS(create_module), 255 },
+ { SCMP_SYS(get_kernel_syms), 255 },
+ { SCMP_SYS(query_module), 255 },
+ { SCMP_SYS(sgetmask), 255 },
+ { SCMP_SYS(ssetmask), 255 },
+ { SCMP_SYS(sysfs), 255 },
+ { SCMP_SYS(uselib), 255 },
+ { SCMP_SYS(ustat), 255 },
+};
+
static const struct QemuSeccompSyscall blacklist[] = {
{ SCMP_SYS(reboot), 255 },
{ SCMP_SYS(swapon), 255 },
@@ -56,7 +70,20 @@ static const struct QemuSeccompSyscall blacklist[] = {
{ SCMP_SYS(vserver), 255 },
};
-int seccomp_start(void)
+static int is_obsolete(int syscall)
+{
+ unsigned int i = 0;
+
+ for (i = 0; i < ARRAY_SIZE(obsolete); i++) {
+ if (syscall == obsolete[i].num) {
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+int seccomp_start(uint8_t seccomp_opts)
{
int rc = 0;
unsigned int i = 0;
@@ -69,6 +96,9 @@ int seccomp_start(void)
}
for (i = 0; i < ARRAY_SIZE(blacklist); i++) {
+ if ((seccomp_opts & OBSOLETE) && is_obsolete(blacklist[i].num)) {
+ continue;
+ }
rc = seccomp_rule_add(ctx, SCMP_ACT_KILL, blacklist[i].num, 0);
if (rc < 0) {
goto seccomp_return;
diff --git a/vl.c b/vl.c
index 15b98800e9..cbe09c94af 100644
--- a/vl.c
+++ b/vl.c
@@ -271,6 +271,10 @@ static QemuOptsList qemu_sandbox_opts = {
.name = "enable",
.type = QEMU_OPT_BOOL,
},
+ {
+ .name = "obsolete",
+ .type = QEMU_OPT_STRING,
+ },
{ /* end of list */ }
},
};
@@ -1032,7 +1036,17 @@ static int parse_sandbox(void *opaque, QemuOpts *opts, Error **errp)
{
if (qemu_opt_get_bool(opts, "enable", false)) {
#ifdef CONFIG_SECCOMP
- if (seccomp_start() < 0) {
+ uint8_t seccomp_opts = 0x0000;
+ const char *value = NULL;
+
+ value = qemu_opt_get(opts, "obsolete");
+ if (value) {
+ if (strcmp(value, "allow") == 0) {
+ seccomp_opts |= OBSOLETE;
+ }
+ }
+
+ if (seccomp_start(seccomp_opts) < 0) {
error_report("failed to install seccomp syscall filter "
"in the kernel");
return -1;
--
2.13.3
next prev parent reply other threads:[~2017-07-21 12:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-21 12:52 [Qemu-devel] [PATCH v3 0/6] seccomp: feature refactoring Eduardo Otubo
2017-07-21 12:52 ` [Qemu-devel] [PATCH 1/6] seccomp: changing from whitelist to blacklist Eduardo Otubo
2017-07-21 12:52 ` Eduardo Otubo [this message]
2017-07-21 12:52 ` [Qemu-devel] [PATCH 3/6] seccomp: add elevateprivileges argument to command line Eduardo Otubo
2017-07-21 12:52 ` [Qemu-devel] [PATCH 4/6] seccomp: add spawn " Eduardo Otubo
2017-07-21 12:52 ` [Qemu-devel] [PATCH 5/6] seccomp: add resourcecontrol " Eduardo Otubo
2017-07-21 12:52 ` [Qemu-devel] [PATCH 6/6] seccomp: adding documentation to new seccomp model Eduardo Otubo
-- strict thread matches above, loose matches on Subject: below --
2017-07-14 11:36 [Qemu-devel] [PATCH 0/6] seccomp: feature refactoring Eduardo Otubo
2017-07-14 11:36 ` [Qemu-devel] [PATCH 2/6] seccomp: add obsolete argument to command line Eduardo Otubo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170721125235.11939-3-otubo@redhat.com \
--to=otubo@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.