From patchwork Thu Mar 10 18:30:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel De Graaf X-Patchwork-Id: 8559361 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2918F9F2B4 for ; Thu, 10 Mar 2016 18:33:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2EE45201F2 for ; Thu, 10 Mar 2016 18:33:47 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2C23F201C0 for ; Thu, 10 Mar 2016 18:33:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1ae5M8-0000bp-PV; Thu, 10 Mar 2016 18:30:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1ae5M8-0000bj-3M for xen-devel@lists.xenproject.org; Thu, 10 Mar 2016 18:30:40 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 02/77-02901-F4DB1E65; Thu, 10 Mar 2016 18:30:39 +0000 X-Env-Sender: dgdegra@tycho.nsa.gov X-Msg-Ref: server-4.tower-27.messagelabs.com!1457634637!29369470!1 X-Originating-IP: [63.239.67.10] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16294 invoked from network); 10 Mar 2016 18:30:38 -0000 Received: from emvm-gh1-uea09.nsa.gov (HELO emvm-gh1-uea09.nsa.gov) (63.239.67.10) by server-4.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 10 Mar 2016 18:30:38 -0000 X-TM-IMSS-Message-ID: <611084d60002d9d1@nsa.gov> Received: from tarius.tycho.ncsc.mil ([144.51.242.1]) by nsa.gov ([10.208.42.194]) with ESMTP (TREND IMSS SMTP Service 7.1) id 611084d60002d9d1 ; Thu, 10 Mar 2016 13:34:42 -0500 Received: from moss-nexus.infosec.tycho.ncsc.mil (moss-nexus [192.168.25.48]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u2AIUVbD026512; Thu, 10 Mar 2016 13:30:33 -0500 From: Daniel De Graaf To: xen-devel@lists.xenproject.org Date: Thu, 10 Mar 2016 13:30:29 -0500 Message-Id: <1457634629-28324-1-git-send-email-dgdegra@tycho.nsa.gov> X-Mailer: git-send-email 2.5.0 In-Reply-To: <20160310171059.GA32334@char.us.oracle.com> References: <20160310171059.GA32334@char.us.oracle.com> X-TM-AS-MML: disable Cc: andrew.cooper3@citrix.com, Daniel De Graaf , cardoe@cardoe.com Subject: [Xen-devel] [PATCH] flask: change default state to enforcing X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The previous default of "permissive" is meant for developing or debugging a disaggregated system. However, this default makes it too easy to accidentally boot a machine in this state, which does not place any restrictions on guests. This is not suitable for normal systems because any guest can perform any operation (including operations like rebooting the machine, kexec, and reading or writing another domain's memory). This change will cause the boot to fail if you do not specify an XSM policy during boot; if you need to load a policy from dom0, use the "flask=late" boot parameter. Originally by Konrad Rzeszutek Wilk ; modified to also change the default value of flask_enforcing so that the policy is not still in permissive mode. This also removes the (no longer documented) command line argument directly changing that variable since it has been superseded by the flask= parameter. Signed-off-by: Daniel De Graaf --- docs/misc/xen-command-line.markdown | 2 +- docs/misc/xsm-flask.txt | 12 ++++++------ xen/xsm/flask/flask_op.c | 8 +++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index ca77e3b..9e77f8a 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -662,7 +662,7 @@ to use the default. ### flask > `= permissive | enforcing | late | disabled` -> Default: `permissive` +> Default: `enforcing` Specify how the FLASK security server should be configured. This option is only available if the hypervisor was compiled with XSM support (which can be enabled diff --git a/docs/misc/xsm-flask.txt b/docs/misc/xsm-flask.txt index fb2fe9f..00a2b13 100644 --- a/docs/misc/xsm-flask.txt +++ b/docs/misc/xsm-flask.txt @@ -283,12 +283,12 @@ for passthrough, run: This command must be rerun on each boot or after any policy reload. -The example policy was only tested with simple domain creation and may be -missing rules allowing accesses by dom0 or domU when a number of hypervisor -features are used. When first loading or writing a policy, you should run FLASK -in permissive mode (the default) and check the Xen logs (xl dmesg) for AVC -denials before using it in enforcing mode (flask_enforcing=1 on the command -line, or xl setenforce). +When first loading or writing a policy, you should run FLASK in permissive mode +(flask=permissive on the command line) and check the Xen logs (xl dmesg) for AVC +denials before using it in enforcing mode (the default value of the boot +parameter, which can also be changed using xl setenforce). When using the +default types for domains (domU_t), the example policy shipped with Xen should +allow the same operations on or between domains as when not using FLASK. MLS/MCS policy diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index f4f5dd1..cdb462c 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -25,12 +25,11 @@ #define _copy_to_guest copy_to_guest #define _copy_from_guest copy_from_guest -enum flask_bootparam_t __read_mostly flask_bootparam = FLASK_BOOTPARAM_PERMISSIVE; +enum flask_bootparam_t __read_mostly flask_bootparam = FLASK_BOOTPARAM_ENFORCING; static void parse_flask_param(char *s); custom_param("flask", parse_flask_param); -bool_t __read_mostly flask_enforcing = 0; -boolean_param("flask_enforcing", flask_enforcing); +bool_t __read_mostly flask_enforcing = 1; #define MAX_POLICY_SIZE 0x4000000 @@ -76,7 +75,10 @@ static void __init parse_flask_param(char *s) else if ( !strcmp(s, "disabled") ) flask_bootparam = FLASK_BOOTPARAM_DISABLED; else if ( !strcmp(s, "permissive") ) + { + flask_enforcing = 0; flask_bootparam = FLASK_BOOTPARAM_PERMISSIVE; + } else flask_bootparam = FLASK_BOOTPARAM_INVALID; }