From patchwork Tue Mar 14 11:32:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Otubo X-Patchwork-Id: 9623089 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 60E9D604A9 for ; Tue, 14 Mar 2017 11:36:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5527F284DC for ; Tue, 14 Mar 2017 11:36:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A00B2852E; Tue, 14 Mar 2017 11:36:51 +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 C07EF2853B for ; Tue, 14 Mar 2017 11:36:50 +0000 (UTC) Received: from localhost ([::1]:57885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnkkz-0003qE-TB 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]:52952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnkgZ-0000i8-Ni for qemu-devel@nongnu.org; Tue, 14 Mar 2017 07:32:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnkgY-00084n-H3 for qemu-devel@nongnu.org; Tue, 14 Mar 2017 07:32:15 -0400 Received: from mail-wr0-x233.google.com ([2a00:1450:400c:c0c::233]:33465) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cnkgY-00083z-AP for qemu-devel@nongnu.org; Tue, 14 Mar 2017 07:32:14 -0400 Received: by mail-wr0-x233.google.com with SMTP id u48so122058950wrc.0 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=48XFLoYcziJSgzdYGvPV5rX8e9eeGAL/ex4J0etO+Tk=; b=Imv2ENXNFcJ0VO9GwhvnWlvb/YzR8tCj2ilwkl8s2zlBP0Bt0M7/WN2r25fu5MKW0S 0b9Q+uVcnWup+0wzK0Ci9uorR4rUT9ltu+ci441D1DoIF36a02ZEV4UxsiWp4rHbPC1e cgG0vZXHsKQp9TWrZ+huBp6rbmoOmoyLRB92lpNmUj1cA2gdXIx021RkERcGQw5duMvA iRdYKeZA2zrNFrGl+o/K3CsHiGDXLydy/e+R6g0ucu/OMaod7hSwUarsCqQ3j8KfQ464 XLqUCNJnoe3ujwRjVJ/2Yc5OuNjPiqn54zvfCjRZCsiB2c7c+s+OOFqTQXfQTN0Zen0j gUFQ== 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=48XFLoYcziJSgzdYGvPV5rX8e9eeGAL/ex4J0etO+Tk=; b=H6aX0vIpLsex2SJ1G2U1gQJyifmvnzB/oisrsHtla6Zu7U2LFrKtUyuYQIqJKHcDtr BH5GATy4DiNzY7vYgmGx1SjHxrPIsqI6g/AxfBgUKoGPfwbRjDi4qzejhWCHfvhdEwHk kN4wO5SEwezHMtbN2akjSvmDQmiyu+8mhHkm9BC9KEAcX41conxXdUQ0taX6b5TJ+XmT qG+c6EVMYtxgwjFc6niByF2+gsNnoxkIsO86W/zFfNXBQS6i1ZrqPcMPWTN3B1eeZoG0 L3+URpRyH9d9fVZ+C92v4TlHrlnHOZ2LgU0DqhNuVheVddrJHStEy0uK/rkJQeifSGP3 mRug== X-Gm-Message-State: AMke39klcMhz5VIsoMfoH+Cp1FLwH8R7g2ZyPDZUShyOfW0PIWUIJ2thUWeBCbIVnDQti9wo X-Received: by 10.223.139.196 with SMTP id w4mr33637688wra.172.1489491133065; 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.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Mar 2017 04:32:12 -0700 (PDT) From: Eduardo Otubo To: qemu-devel@nongnu.org Date: Tue, 14 Mar 2017 12:32:07 +0100 Message-Id: <20170314113209.12025-4-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: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::233 Subject: [Qemu-devel] [PATCH 3/5] seccomp: add elevateprivileges 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 introduces the new argument [,elevateprivileges=deny] to the `-sandbox on'. It avoids Qemu process to elevate its privileges by blacklisting all set*uid|gid system calls Signed-off-by: Eduardo Otubo --- include/sysemu/seccomp.h | 1 + qemu-options.hx | 8 ++++++-- qemu-seccomp.c | 28 ++++++++++++++++++++++++++++ vl.c | 11 +++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/include/sysemu/seccomp.h b/include/sysemu/seccomp.h index 7a7bde246b..e6e78d85ce 100644 --- a/include/sysemu/seccomp.h +++ b/include/sysemu/seccomp.h @@ -16,6 +16,7 @@ #define QEMU_SECCOMP_H #define OBSOLETE 0x0001 +#define PRIVILEGED 0x0010 #include diff --git a/qemu-options.hx b/qemu-options.hx index 1403d0c85f..47018db5aa 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3732,8 +3732,10 @@ Old param mode (ARM only). ETEXI DEF("sandbox", HAS_ARG, QEMU_OPTION_sandbox, \ - "-sandbox on[,obsolete=allow] Enable seccomp mode 2 system call filter (default 'off').\n" \ - " obsolete: Allow obsolete system calls", + "-sandbox on[,obsolete=allow][,elevateprivileges=deny]\n" \ + " 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", QEMU_ARCH_ALL) STEXI @item -sandbox @var{arg}[,obsolete=@var{string}] @@ -3743,6 +3745,8 @@ disable it. The default is 'off'. @table @option @item obsolete=@var{string} Enable Obsolete system calls +@item elevateprivileges=@var{string} +Disable set*uid|gid systema calls @end table ETEXI diff --git a/qemu-seccomp.c b/qemu-seccomp.c index 5ef36890da..5aa6590386 100644 --- a/qemu-seccomp.c +++ b/qemu-seccomp.c @@ -31,6 +31,19 @@ struct QemuSeccompSyscall { uint8_t priority; }; +static const struct QemuSeccompSyscall privileged_syscalls[] = { + { SCMP_SYS(setuid), 255 }, + { SCMP_SYS(setgid), 255 }, + { SCMP_SYS(setpgid), 255 }, + { SCMP_SYS(setsid), 255 }, + { SCMP_SYS(setreuid), 255 }, + { SCMP_SYS(setregid), 255 }, + { SCMP_SYS(setresuid), 255 }, + { SCMP_SYS(setresgid), 255 }, + { SCMP_SYS(setfsuid), 255 }, + { SCMP_SYS(setfsgid), 255 }, +}; + static const struct QemuSeccompSyscall obsolete[] = { { SCMP_SYS(readdir), 255 }, { SCMP_SYS(_sysctl), 255 }, @@ -125,6 +138,21 @@ int seccomp_start(uint8_t seccomp_opts) } } + if (seccomp_opts & PRIVILEGED) { + for (i = 0; i < ARRAY_SIZE(privileged_syscalls); i++) { + rc = seccomp_rule_add(ctx, SCMP_ACT_KILL, privileged_syscalls[i].num, 0); + if (rc < 0) { + goto seccomp_return; + } + rc = seccomp_syscall_priority(ctx, privileged_syscalls[i].num, + privileged_syscalls[i].priority); + if (rc < 0) { + goto seccomp_return; + } + } + } + + rc = seccomp_load(ctx); seccomp_return: diff --git a/vl.c b/vl.c index 7b08b3383b..d071e240b0 100644 --- a/vl.c +++ b/vl.c @@ -273,6 +273,10 @@ static QemuOptsList qemu_sandbox_opts = { .name = "obsolete", .type = QEMU_OPT_STRING, }, + { + .name = "elevateprivileges", + .type = QEMU_OPT_STRING, + }, { /* end of list */ } }, }; @@ -1045,6 +1049,13 @@ static int parse_sandbox(void *opaque, QemuOpts *opts, Error **errp) } } + value = qemu_opt_get(opts,"elevateprivileges"); + if (value) { + if (strcmp(value, "deny") == 0) { + seccomp_opts |= PRIVILEGED; + } + } + if (seccomp_start(seccomp_opts) < 0) { error_report("failed to install seccomp syscall filter " "in the kernel");