From patchwork Wed Apr 20 21:04:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel P. Smith" X-Patchwork-Id: 12820597 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DF445C433F5 for ; Wed, 20 Apr 2022 17:03:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.309508.525818 (Exim 4.92) (envelope-from ) id 1nhDj9-0001FW-Fy; Wed, 20 Apr 2022 17:02:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 309508.525818; Wed, 20 Apr 2022 17:02:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nhDj9-0001FP-Cb; Wed, 20 Apr 2022 17:02:51 +0000 Received: by outflank-mailman (input) for mailman id 309508; Wed, 20 Apr 2022 17:02:50 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nhDj8-0000xW-BO for xen-devel@lists.xenproject.org; Wed, 20 Apr 2022 17:02:50 +0000 Received: from sender4-of-o51.zoho.com (sender4-of-o51.zoho.com [136.143.188.51]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b46a4f18-c0cb-11ec-8fbf-03012f2f19d4; Wed, 20 Apr 2022 19:02:49 +0200 (CEST) Received: from sisyou.hme. (static-72-81-132-2.bltmmd.fios.verizon.net [72.81.132.2]) by mx.zohomail.com with SMTPS id 1650474158293185.54717793821146; Wed, 20 Apr 2022 10:02:38 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b46a4f18-c0cb-11ec-8fbf-03012f2f19d4 ARC-Seal: i=1; a=rsa-sha256; t=1650474162; cv=none; d=zohomail.com; s=zohoarc; b=cp8o60aNK+qXKZNp6V3qPn+ET9lHf/J6rPUtLwd+WQXDlbX2lGYcKpD7GGCi4Vj4mRR6KgzgQN8p3oTpeaU5jGe0QHt2npXjNQ3noO3EMIP0zAdRR+dRk5i+Sm77cngzqvmrnNOS1JLvi6nFl2WQzEnPYMi9OeBhPtlttMu6jgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650474162; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Y5VK/nn1NuDaRru49lx3xM09xnkVW4XL3YTrgNudhT0=; b=fgMERb0mNbEE4pPJewta3ZKnDsoOY+Omf7GrYwjjEX8J37XLorqczWJW8cmHOLsBFkMyC7IAi4P2f8bwZENhvsybp3h/Sn1z1sdHHDv4xoSZwtR7U2ZwppJAilgQBFtclzTD3bNeNwC1+pf63DlckKWpaTgi2XKQYz2hnRG8SkM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=apertussolutions.com; spf=pass smtp.mailfrom=dpsmith@apertussolutions.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1650474162; s=zoho; d=apertussolutions.com; i=dpsmith@apertussolutions.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=Y5VK/nn1NuDaRru49lx3xM09xnkVW4XL3YTrgNudhT0=; b=ZXVpO3VTCyG3as2hfQhB324EdOezED4HtRzBuFlXa+zDdfZNlA8bSL+LBfT0EdLN 6Js82YMGpYebDiS8KEA8SvhkctGDkN4l94taUGx55WCi73zgdJKvDA5wWyTMoO97QXK CWN7z0YLRHNxxaDFNtNMrvWDAVKWYQy9DPuagBOk= From: "Daniel P. Smith" To: xen-devel@lists.xenproject.org, Volodymyr Babchuk , Wei Liu , "Daniel P. Smith" Cc: scott.davis@starlab.io, jandryuk@gmail.com, Stefano Stabellini , Julien Grall , Bertrand Marquis , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , George Dunlap , Dario Faggioli , Daniel De Graaf Subject: [PATCH 1/2] xsm: create idle domain privieged and demote after setup Date: Wed, 20 Apr 2022 17:04:06 -0400 Message-Id: <20220420210407.18060-2-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220420210407.18060-1-dpsmith@apertussolutions.com> References: <20220420210407.18060-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 X-ZohoMailClient: External There are now instances where internal hypervisor logic needs to make resource allocation calls that are protectd by XSM checks. The internal hypervisor logic is represented a number of system domains which by designed are represented by non-privileged struct domain instances. To enable these logic blocks to function correctly but in a controlled manner, this commit changes the idle domain to be created as a privileged domain under the default policy, which is inherited by the SILO policy, and demoted before transitioning to running. A new XSM hook, xsm_transition_running, is introduced to allow each XSM policy type to demote the idle domain appropriately for that policy type. For flask a stub is added to ensure that flask policy system will function correctly with this patch until flask is extended with support for starting the idle domain privileged and properly demoting it on the call to xsm_transtion_running. Signed-off-by: Daniel P. Smith --- xen/arch/arm/setup.c | 6 ++++++ xen/arch/x86/setup.c | 6 ++++++ xen/common/sched/core.c | 7 ++++++- xen/include/xsm/dummy.h | 12 ++++++++++++ xen/include/xsm/xsm.h | 6 ++++++ xen/xsm/dummy.c | 1 + xen/xsm/flask/hooks.c | 15 +++++++++++++++ 7 files changed, 52 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d5d0792ed4..763835aeb5 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -1048,6 +1048,12 @@ void __init start_xen(unsigned long boot_phys_offset, /* Hide UART from DOM0 if we're using it */ serial_endboot(); + xsm_transition_running(); + + /* Ensure idle domain was not left privileged */ + if ( current->domain->is_privileged ) + panic("idle domain did not properly transition from setup privilege\n"); + system_state = SYS_STATE_active; for_each_domain( d ) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6f20e17892..72695dcb07 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -621,6 +621,12 @@ static void noreturn init_done(void) void *va; unsigned long start, end; + xsm_transition_running(); + + /* Ensure idle domain was not left privileged */ + if ( current->domain->is_privileged ) + panic("idle domain did not properly transition from setup privilege\n"); + system_state = SYS_STATE_active; domain_unpause_by_systemcontroller(dom0); diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 19ab678181..22a619e260 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -3021,7 +3021,12 @@ void __init scheduler_init(void) sched_ratelimit_us = SCHED_DEFAULT_RATELIMIT_US; } - idle_domain = domain_create(DOMID_IDLE, NULL, 0); + /* + * idle dom is created privileged to ensure unrestricted access during + * setup and will be demoted by xsm_transition_running when setup is + * complete + */ + idle_domain = domain_create(DOMID_IDLE, NULL, CDF_privileged); BUG_ON(IS_ERR(idle_domain)); BUG_ON(nr_cpu_ids > ARRAY_SIZE(idle_vcpu)); idle_domain->vcpu = idle_vcpu; diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 58afc1d589..b33f0ec672 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -101,6 +101,18 @@ static always_inline int xsm_default_action( } } +static XSM_INLINE void cf_check xsm_transition_running(void) +{ + struct domain *d = current->domain; + + if ( d->domain_id != DOMID_IDLE ) + panic("xsm_transition_running should only be called by idle domain\n"); + + d->is_privileged = false; + + return; +} + static XSM_INLINE void cf_check xsm_security_domaininfo( struct domain *d, struct xen_domctl_getdomaininfo *info) { diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 3e2b7fe3db..a5c06804ab 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -52,6 +52,7 @@ typedef enum xsm_default xsm_default_t; * !!! WARNING !!! */ struct xsm_ops { + void (*transition_running)(void); void (*security_domaininfo)(struct domain *d, struct xen_domctl_getdomaininfo *info); int (*domain_create)(struct domain *d, uint32_t ssidref); @@ -208,6 +209,11 @@ extern struct xsm_ops xsm_ops; #ifndef XSM_NO_WRAPPERS +static inline void xsm_transition_running(void) +{ + alternative_vcall(xsm_ops.transition_running); +} + static inline void xsm_security_domaininfo( struct domain *d, struct xen_domctl_getdomaininfo *info) { diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 8c044ef615..66f26c6909 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -14,6 +14,7 @@ #include static const struct xsm_ops __initconst_cf_clobber dummy_ops = { + .transition_running = xsm_transition_running, .security_domaininfo = xsm_security_domaininfo, .domain_create = xsm_domain_create, .getdomaininfo = xsm_getdomaininfo, diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 0bf63ffa84..51c896d9f7 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -186,6 +186,20 @@ static int cf_check flask_domain_alloc_security(struct domain *d) return 0; } +static void cf_check flask_domain_runtime_security(void) +{ + struct domain *d = current->domain; + + if ( d->domain_id != DOMID_IDLE ) + panic("xsm_transition_running should only be called by idle domain\n"); + + /* + * While is_privileged has no significant meaning under flask, + * set to false for the consistency check(s) in the setup code. + */ + d->is_privileged = false; +} + static void cf_check flask_domain_free_security(struct domain *d) { struct domain_security_struct *dsec = d->ssid; @@ -1766,6 +1780,7 @@ static int cf_check flask_argo_send( #endif static const struct xsm_ops __initconst_cf_clobber flask_ops = { + .transition_running = flask_domain_runtime_security, .security_domaininfo = flask_security_domaininfo, .domain_create = flask_domain_create, .getdomaininfo = flask_getdomaininfo, From patchwork Wed Apr 20 21:04:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel P. Smith" X-Patchwork-Id: 12820598 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 29C77C433EF for ; Wed, 20 Apr 2022 17:03:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.309517.525828 (Exim 4.92) (envelope-from ) id 1nhDjj-0001yS-Oy; Wed, 20 Apr 2022 17:03:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 309517.525828; Wed, 20 Apr 2022 17:03:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nhDjj-0001yL-Lv; Wed, 20 Apr 2022 17:03:27 +0000 Received: by outflank-mailman (input) for mailman id 309517; Wed, 20 Apr 2022 17:03:26 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nhDji-0001aR-PC for xen-devel@lists.xenproject.org; Wed, 20 Apr 2022 17:03:26 +0000 Received: from sender4-of-o51.zoho.com (sender4-of-o51.zoho.com [136.143.188.51]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ca307303-c0cb-11ec-a405-831a346695d4; Wed, 20 Apr 2022 19:03:25 +0200 (CEST) Received: from sisyou.hme. (static-72-81-132-2.bltmmd.fios.verizon.net [72.81.132.2]) by mx.zohomail.com with SMTPS id 1650474160905460.02002794635507; Wed, 20 Apr 2022 10:02:40 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ca307303-c0cb-11ec-a405-831a346695d4 ARC-Seal: i=1; a=rsa-sha256; t=1650474163; cv=none; d=zohomail.com; s=zohoarc; b=CTxWLgCeuWnLv2VOCcXmi09a880v9ZBTFREtRMNRReO5Ru90scD+dp9jKce9+YVRuetMrRG0+e9q7mr+ehzCqdg1+HDOZk4fRp4fimRwl6I7iJIOvlbR+rbglj/vZrmGpE5Tkqy3AeYMxLBRdE98XROonvOhGNvoBbEjZb4VEeo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650474163; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=TymRc8V7wVKkFF8i7BKHRUOSpUbifIpbb54+vNPswqA=; b=RzW18awQrx3YbGuvUIdfikJQfzRSHreOPJFzXcRy4HGLjio/TCmYPpIgdnbl3+zoVA9LBEswyI50xMqp0u/QYimSn+aNHt0oeF42+ILKp1QnL38sk71MhztuyciiD2/L5wA9G48/+yF39D+aaB6miSCMPSEEqVh4GuNKdjoe5lw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=apertussolutions.com; spf=pass smtp.mailfrom=dpsmith@apertussolutions.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1650474163; s=zoho; d=apertussolutions.com; i=dpsmith@apertussolutions.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=TymRc8V7wVKkFF8i7BKHRUOSpUbifIpbb54+vNPswqA=; b=h/P7V63m83DhKw/S5tRl3bFWX8Tps4+Zua/m7YoXu3ixN88k1Sa9NDZQ0rGRFsQR Gd4l5QuEDcY1ItX9au60TvwQPoCa1I52RPDDXDyFaxQApp29zelfevOFmPE4jrDq37I 4FrZZo0x1s/sfO+fbl5Jy7dingqFRvzMFiLXDcjU= From: "Daniel P. Smith" To: xen-devel@lists.xenproject.org, "Daniel P. Smith" Cc: scott.davis@starlab.io, jandryuk@gmail.com, Daniel De Graaf , Wei Liu , Anthony PERARD Subject: [PATCH 2/2] flask: implement xsm_transtion_running Date: Wed, 20 Apr 2022 17:04:07 -0400 Message-Id: <20220420210407.18060-3-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220420210407.18060-1-dpsmith@apertussolutions.com> References: <20220420210407.18060-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 X-ZohoMailClient: External This commit implements full support for starting the idle domain privileged by introducing a new flask label xenboot_t which the idle domain is labeled with at creation. It then provides the implementation for the XSM hook xsm_transition_running to relabel the idle domain to the existing xen_t flask label. In the reference flask policy a new macro, xen_build_domain(target), is introduced for creating policies for dom0less/hyperlaunch allowing the hypervisor to create and assign the necessary resources for domain construction. Signed-off-by: Daniel P. Smith --- tools/flask/policy/modules/xen.if | 6 ++++++ tools/flask/policy/modules/xen.te | 1 + tools/flask/policy/policy/initial_sids | 1 + xen/xsm/flask/hooks.c | 6 +++++- xen/xsm/flask/policy/initial_sids | 1 + 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/flask/policy/modules/xen.if b/tools/flask/policy/modules/xen.if index 5e2aa472b6..4ec676fff1 100644 --- a/tools/flask/policy/modules/xen.if +++ b/tools/flask/policy/modules/xen.if @@ -62,6 +62,12 @@ define(`create_domain_common', ` setparam altp2mhvm altp2mhvm_op dm }; ') +# xen_build_domain(target) +# Allow a domain to be created at boot by the hypervisor +define(`xen_build_domain', ` + allow xenboot_t $1_channel:event create; +') + # create_domain(priv, target) # Allow a domain to be created directly define(`create_domain', ` diff --git a/tools/flask/policy/modules/xen.te b/tools/flask/policy/modules/xen.te index 3dbf93d2b8..de98206fdd 100644 --- a/tools/flask/policy/modules/xen.te +++ b/tools/flask/policy/modules/xen.te @@ -24,6 +24,7 @@ attribute mls_priv; ################################################################################ # The hypervisor itself +type xenboot_t, xen_type, mls_priv; type xen_t, xen_type, mls_priv; # Domain 0 diff --git a/tools/flask/policy/policy/initial_sids b/tools/flask/policy/policy/initial_sids index 6b7b7eff21..ec729d3ba3 100644 --- a/tools/flask/policy/policy/initial_sids +++ b/tools/flask/policy/policy/initial_sids @@ -2,6 +2,7 @@ # objects created before the policy is loaded or for objects that do not have a # label defined in some other manner. +sid xenboot gen_context(system_u:system_r:xenboot_t,s0) sid xen gen_context(system_u:system_r:xen_t,s0) sid dom0 gen_context(system_u:system_r:dom0_t,s0) sid domxen gen_context(system_u:system_r:domxen_t,s0) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 51c896d9f7..7e840af6fc 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -168,7 +168,7 @@ static int cf_check flask_domain_alloc_security(struct domain *d) switch ( d->domain_id ) { case DOMID_IDLE: - dsec->sid = SECINITSID_XEN; + dsec->sid = SECINITSID_XENBOOT; break; case DOMID_XEN: dsec->sid = SECINITSID_DOMXEN; @@ -188,6 +188,7 @@ static int cf_check flask_domain_alloc_security(struct domain *d) static void cf_check flask_domain_runtime_security(void) { + struct domain_security_struct *dsec; struct domain *d = current->domain; if ( d->domain_id != DOMID_IDLE ) @@ -198,6 +199,9 @@ static void cf_check flask_domain_runtime_security(void) * set to false for the consistency check(s) in the setup code. */ d->is_privileged = false; + + dsec = d->ssid; + dsec->sid = SECINITSID_XEN; } static void cf_check flask_domain_free_security(struct domain *d) diff --git a/xen/xsm/flask/policy/initial_sids b/xen/xsm/flask/policy/initial_sids index 7eca70d339..e8b55b8368 100644 --- a/xen/xsm/flask/policy/initial_sids +++ b/xen/xsm/flask/policy/initial_sids @@ -3,6 +3,7 @@ # # Define initial security identifiers # +sid xenboot sid xen sid dom0 sid domio