From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VI1cP-0001UL-Sw for qemu-devel@nongnu.org; Fri, 06 Sep 2013 15:23:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VI1cB-0008MX-Gh for qemu-devel@nongnu.org; Fri, 06 Sep 2013 15:22:57 -0400 Received: from e24smtp02.br.ibm.com ([32.104.18.86]:34408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VI1cB-0008I4-3x for qemu-devel@nongnu.org; Fri, 06 Sep 2013 15:22:43 -0400 Received: from /spool/local by e24smtp02.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 6 Sep 2013 16:22:41 -0300 Received: from d24relay03.br.ibm.com (d24relay03.br.ibm.com [9.13.184.25]) by d24dlp02.br.ibm.com (Postfix) with ESMTP id EB62C1DC0060 for ; Fri, 6 Sep 2013 15:22:37 -0400 (EDT) Received: from d24av04.br.ibm.com (d24av04.br.ibm.com [9.8.31.97]) by d24relay03.br.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r86JL7m338273090 for ; Fri, 6 Sep 2013 16:21:07 -0300 Received: from d24av04.br.ibm.com (localhost [127.0.0.1]) by d24av04.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r86JMbec002342 for ; Fri, 6 Sep 2013 16:22:37 -0300 From: Eduardo Otubo Date: Fri, 6 Sep 2013 16:21:47 -0300 Message-Id: <1378495308-24560-3-git-send-email-otubo@linux.vnet.ibm.com> In-Reply-To: <1378495308-24560-1-git-send-email-otubo@linux.vnet.ibm.com> References: <1378495308-24560-1-git-send-email-otubo@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCHv2 2/3] seccomp: adding command line support for blacklist List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pmoore@redhat.com, coreyb@linux.vnet.ibm.com, Eduardo Otubo New command line options for the seccomp blacklist feature: $ qemu -sandbox on[,strict=] The strict parameter will turn on or off the new system call blacklist Signed-off-by: Eduardo Otubo --- qemu-options.hx | 8 +++++--- vl.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index d15338e..05485e1 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2978,13 +2978,15 @@ Old param mode (ARM only). ETEXI DEF("sandbox", HAS_ARG, QEMU_OPTION_sandbox, \ - "-sandbox Enable seccomp mode 2 system call filter (default 'off').\n", + "-sandbox Enable seccomp mode 2 system call filter (default 'off').\n" + "-sandbox on[,strict=]\n" + " Enable seccomp mode 2 system call second level filter (default 'off').\n", QEMU_ARCH_ALL) STEXI -@item -sandbox @var{arg} +@item -sandbox @var{arg}[,strict=@var{value}] @findex -sandbox Enable Seccomp mode 2 system call filter. 'on' will enable syscall filtering and 'off' will -disable it. The default is 'off'. +disable it. The default is 'off'. 'strict=on' will enable second level filter (default is 'off'). ETEXI DEF("readconfig", HAS_ARG, QEMU_OPTION_readconfig, diff --git a/vl.c b/vl.c index 02f7486..909f685 100644 --- a/vl.c +++ b/vl.c @@ -329,6 +329,9 @@ static QemuOptsList qemu_sandbox_opts = { { .name = "enable", .type = QEMU_OPT_BOOL, + },{ + .name = "strict", + .type = QEMU_OPT_STRING, }, { /* end of list */ } }, @@ -1031,6 +1034,7 @@ static int bt_parse(const char *opt) static int parse_sandbox(QemuOpts *opts, void *opaque) { + const char * strict_value = NULL; /* FIXME: change this to true for 1.3 */ if (qemu_opt_get_bool(opts, "enable", false)) { #ifdef CONFIG_SECCOMP @@ -1040,7 +1044,12 @@ static int parse_sandbox(QemuOpts *opts, void *opaque) return -1; } - enable_blacklist = true; + strict_value = qemu_opt_get(opts, "strict"); + if (strict_value) { + if (!strcmp(strict_value, "on")) { + enable_blacklist = true; + } + } #else qerror_report(ERROR_CLASS_GENERIC_ERROR, "sandboxing request but seccomp is not compiled into this build"); -- 1.8.3.1