From patchwork Tue Mar 14 11:32:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Otubo X-Patchwork-Id: 9623087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C6F9B604A9 for ; Tue, 14 Mar 2017 11:36:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAED1284DC for ; Tue, 14 Mar 2017 11:36:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE73128534; Tue, 14 Mar 2017 11:36:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 06F78284DC for ; Tue, 14 Mar 2017 11:36:50 +0000 (UTC) Received: from localhost ([::1]:57884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnkkz-0003pw-4k for patchwork-qemu-devel@patchwork.kernel.org; Tue, 14 Mar 2017 07:36:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnkga-0000iA-A7 for qemu-devel@nongnu.org; Tue, 14 Mar 2017 07:32:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnkgZ-00086u-6z for qemu-devel@nongnu.org; Tue, 14 Mar 2017 07:32:16 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:38094) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cnkgZ-00084b-14 for qemu-devel@nongnu.org; Tue, 14 Mar 2017 07:32:15 -0400 Received: by mail-wm0-x235.google.com with SMTP id t189so61367152wmt.1 for ; Tue, 14 Mar 2017 04:32:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=profitbricks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zINAoOCMlRWlSH3umIOqvQQYBkSGnOhPziJDjYMRpxU=; b=mfmr1dkCTresgiGkUKnT/B6Sy/izBsbxj1uNw0vAgs9ei/4/FmqklhmJOZLP1BBZcv D29A1LN3d6QlI/2lwh6P49v+lrzSHWRS0McyqTQpk+GB/+YXhB2+NTchKr2wztU8D+P3 k+yGsBrnrxQxyPMDDiQZDr63z926soKxUQixGFetoTbDuzpbRkp3vinGV5Fvg3s9tR/u FBp9THRbPdh8RaImVNRE0t8AXIw9/7gnIG5n7HM2Ki2dYAvaDYAslr2p4utohK6FYwhi E1octkYLgHdIazEJUPSCy/FEEDPMDVdyPBIB3HnCH78TRGJI0XtOBXvTybQDy4MMq3wu bR9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zINAoOCMlRWlSH3umIOqvQQYBkSGnOhPziJDjYMRpxU=; b=Qqbz+7XsXJxWmavmTkUBE+Lueg1HWsbqItPPUPfbIdip6DOg8b81HIZxKfd8XoU32g Xuyi4W45p6+BoIffP56/z/Ju2NqViKiBWAnB5scERwxHtoRlDgiPKMfTRPSEn9wm4H2x o++2RKdAz3vebG57+HmojRxQPWfkjGRwq1kbVp594PVJUKFlEEQIrloPNka9DfVZhUiH Fw874cTMccgVkoMWDUZfVkd8SyZDho7fi44o7gVojNDLYNsVKSTGS1qsiz8FQuR1JRX9 lRiLacs93lwjCKBMp80jCYKqwEhr0NKi9fa/w7op+slXTOqJqmJE8918qhgvsGY8nf1g viRg== X-Gm-Message-State: AFeK/H02ClWEr3qtQsfQMAK7QhUqqGymSMjkdCShhpFPHUk7uRbjMUBVPmkZYLf7tsvN4bfP X-Received: by 10.28.50.6 with SMTP id y6mr14298075wmy.112.1489491133925; Tue, 14 Mar 2017 04:32:13 -0700 (PDT) Received: from vader.pb.local ([62.217.45.26]) by smtp.gmail.com with ESMTPSA id n59sm28846267wrb.54.2017.03.14.04.32.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Mar 2017 04:32:13 -0700 (PDT) From: Eduardo Otubo To: qemu-devel@nongnu.org Date: Tue, 14 Mar 2017 12:32:08 +0100 Message-Id: <20170314113209.12025-5-eduardo.otubo@profitbricks.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170314113209.12025-1-eduardo.otubo@profitbricks.com> References: <20170314113209.12025-1-eduardo.otubo@profitbricks.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PATCH 4/5] seccomp: add spawn argument to command line X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch adds [,spawn=deny] argument to `-sandbox on' option. It blacklists fork and execve syste calls, avoiding Qemu to spawn new threads or processes. Signed-off-by: Eduardo Otubo --- include/sysemu/seccomp.h | 1 + qemu-options.hx | 7 +++++-- qemu-seccomp.c | 18 ++++++++++++++++++ vl.c | 11 +++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/include/sysemu/seccomp.h b/include/sysemu/seccomp.h index e6e78d85ce..f1614d6514 100644 --- a/include/sysemu/seccomp.h +++ b/include/sysemu/seccomp.h @@ -17,6 +17,7 @@ #define OBSOLETE 0x0001 #define PRIVILEGED 0x0010 +#define SPAWN 0x0100 #include diff --git a/qemu-options.hx b/qemu-options.hx index 47018db5aa..53f4f8cfd2 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3732,10 +3732,11 @@ Old param mode (ARM only). ETEXI DEF("sandbox", HAS_ARG, QEMU_OPTION_sandbox, \ - "-sandbox on[,obsolete=allow][,elevateprivileges=deny]\n" \ + "-sandbox on[,obsolete=allow][,elevateprivileges=deny][,spawn=deny]" \ " Enable seccomp mode 2 system call filter (default 'off').\n" \ " obsolete: Allow obsolete system calls\n" \ - " elevateprivileges: avoids Qemu process to elevate its privileges by blacklisting all set*uid|gid system calls", + " elevateprivileges: avoids Qemu process to elevate its privileges by blacklisting all set*uid|gid system calls\n" \ + " spawn: avoids Qemu to spawn new threads or processes by blacklisting *fork and execve\n" QEMU_ARCH_ALL) STEXI @item -sandbox @var{arg}[,obsolete=@var{string}] @@ -3747,6 +3748,8 @@ disable it. The default is 'off'. Enable Obsolete system calls @item elevateprivileges=@var{string} Disable set*uid|gid systema calls +@item spawn=@var{string} +Disable *fork and execve @end table ETEXI diff --git a/qemu-seccomp.c b/qemu-seccomp.c index 5aa6590386..4c1f7b41ba 100644 --- a/qemu-seccomp.c +++ b/qemu-seccomp.c @@ -31,6 +31,12 @@ struct QemuSeccompSyscall { uint8_t priority; }; +static const struct QemuSeccompSyscall spawn_syscalls[] = { + { SCMP_SYS(fork), 255 }, + { SCMP_SYS(vfork), 255 }, + { SCMP_SYS(execve), 255 }, +}; + static const struct QemuSeccompSyscall privileged_syscalls[] = { { SCMP_SYS(setuid), 255 }, { SCMP_SYS(setgid), 255 }, @@ -152,6 +158,18 @@ int seccomp_start(uint8_t seccomp_opts) } } + if (seccomp_opts & SPAWN) { + for (i = 0; i < ARRAY_SIZE(spawn_syscalls); i++) { + rc = seccomp_rule_add(ctx, SCMP_ACT_KILL, spawn_syscalls[i].num, 0); + if (rc < 0) { + goto seccomp_return; + } + rc = seccomp_syscall_priority(ctx, spawn_syscalls[i].num, spawn_syscalls[i].priority); + if (rc < 0) { + goto seccomp_return; + } + } + } rc = seccomp_load(ctx); diff --git a/vl.c b/vl.c index d071e240b0..6a6e9a69bf 100644 --- a/vl.c +++ b/vl.c @@ -277,6 +277,10 @@ static QemuOptsList qemu_sandbox_opts = { .name = "elevateprivileges", .type = QEMU_OPT_STRING, }, + { + .name = "spawn", + .type = QEMU_OPT_STRING, + }, { /* end of list */ } }, }; @@ -1056,6 +1060,13 @@ static int parse_sandbox(void *opaque, QemuOpts *opts, Error **errp) } } + value = qemu_opt_get(opts,"spawn"); + if (value) { + if (strcmp(value, "deny") == 0) { + seccomp_opts |= SPAWN; + } + } + if (seccomp_start(seccomp_opts) < 0) { error_report("failed to install seccomp syscall filter " "in the kernel");