From nobody Sat May 11 20:24:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) ARC-Seal: i=2; a=rsa-sha256; t=1651498277; cv=pass; d=zohomail.com; s=zohoarc; b=nqVy0rC6yJHZLFfy9tFOIlHt23oq/kFWoGOc1K4kBkQED2wm/s3RbY3RAoPQSDCZQgXUWJfiFzEVoWlg8KFu3Qj4V3UfqNBX01yjPhpeAvE2I9yv23JJGQrJ0pm67utZkwDHSotHPCSyvwk0dFPmC7WqL10zVHygwRomhQ8sBOA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651498277; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BOUlgflxn7VK30Jea3//ttHn3E+JLPi4eu1nf0QHebY=; b=BDbzsvGiKG6IRHo8+bIle/ITlctzD770sdEoUXxqDrAKUhjiVDfYaNex06ANRzQEcOVh7shJ8uBNWfbLEzA8QpiWQxbEP6EhFrWaqjl6B5M547QqV8LpJYv3/cl2rSn4kZ6OtgOTakY41OU/2QcYnGrshe4+aiVPtfc9wvY6AWE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1651498277248362.1706161371884; Mon, 2 May 2022 06:31:17 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.318858.538819 (Exim 4.92) (envelope-from ) id 1nlW8c-0006Ad-4D; Mon, 02 May 2022 13:30:54 +0000 Received: by outflank-mailman (output) from mailman id 318858.538819; Mon, 02 May 2022 13:30:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nlW8b-0006AW-Vh; Mon, 02 May 2022 13:30:53 +0000 Received: by outflank-mailman (input) for mailman id 318858; Mon, 02 May 2022 13:30:53 +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 1nlW8a-0005cw-TG for xen-devel@lists.xenproject.org; Mon, 02 May 2022 13:30:53 +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 093d3dc5-ca1c-11ec-8fc4-03012f2f19d4; Mon, 02 May 2022 15:30:31 +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 165149824255940.90777056694105; Mon, 2 May 2022 06:30:42 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 093d3dc5-ca1c-11ec-8fc4-03012f2f19d4 ARC-Seal: i=1; a=rsa-sha256; t=1651498245; cv=none; d=zohomail.com; s=zohoarc; b=gJxQ69T9LVdZdtKO2N8q9LAXswFrBctSCtlNLnPCXq8P1N7OxBxFCj/xQt/i49nDIE2ct75cyFHTBx3X9r+L0OQcV/hQtNp7L6/zkeiXM5DuiX35JjLVi+72LzBYKYY81UTPU02u9rdnhMY0FhooyLuSY/qaQ6zPspuMwej9ywQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651498245; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=BOUlgflxn7VK30Jea3//ttHn3E+JLPi4eu1nf0QHebY=; b=b1Xvyb6Wuste10sae5n5rQoO9ubnYhBIsF2iN9BvLGkglSJQRRX2Jo/a+uOiQ/6Qf1Etqek2kKyl4wl4k9FhovhXuqVMLQMyaitaQ9QtdTBvODm4tOieaQodj7OBJvy9CBIFuhLOuQevaeiBRripMe4GFs/u58QpSqs1Ra6fe9w= 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=1651498245; 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=BOUlgflxn7VK30Jea3//ttHn3E+JLPi4eu1nf0QHebY=; b=ZBtCoztuGyKa8ORv9GgdDuWZ3F9fE9JYQtnbOdt3j9Crf/pSkQmj3wnPgvAH1MGP kTLi4jp58kQJXUDSxFt0mk8WRfOGOjG6lIDekt+VAqdvs2fw6eu5ef0jttvuQdk38o7 OzFmmgCHL/jF/K9kDq41QAopHC9noB9xQYFsp+jU= 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, christopher.clark@starlab.io, Stefano Stabellini , Julien Grall , Bertrand Marquis , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , George Dunlap , Dario Faggioli , Daniel De Graaf Subject: [PATCH v5 1/2] xsm: create idle domain privileged and demote after setup Date: Mon, 2 May 2022 09:30:26 -0400 Message-Id: <20220502133027.920-2-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220502133027.920-1-dpsmith@apertussolutions.com> References: <20220502133027.920-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-ZohoMail-DKIM: pass (identity dpsmith@apertussolutions.com) X-ZM-MESSAGEID: 1651498278616100001 Content-Type: text/plain; charset="utf-8" There are new capabilities, dom0less and hyperlaunch, that introduce intern= al hypervisor logic which needs to make resource allocation calls that are protected by XSM access checks. This creates an issue as a subset of the hypervisor code is executed under a system domain, the idle domain, that is represented by a per-CPU non-privileged struct domain. To enable these new capabilities to function correctly but in a controlled manner, this commit changes the idle system domain to be created as a privileged domain under t= he default policy and demoted before transitioning to running. A new XSM hook, xsm_set_system_active(), is introduced to allow each XSM policy type to dem= ote the idle domain appropriately for that policy type. In the case of SILO, it inherits the default policy's hook for xsm_set_system_active(). 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_set_system_active(). Signed-off-by: Daniel P. Smith Reviewed-by: Jason Andryuk Reviewed-by: Luca Fancellu --- xen/arch/arm/setup.c | 4 ++++ xen/arch/x86/setup.c | 5 +++++ xen/common/sched/core.c | 7 ++++++- xen/include/xsm/dummy.h | 17 +++++++++++++++++ xen/include/xsm/xsm.h | 6 ++++++ xen/xsm/dummy.c | 1 + xen/xsm/flask/hooks.c | 14 ++++++++++++++ 7 files changed, 53 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d5d0792ed4..b9057222d6 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -1048,6 +1048,10 @@ void __init start_xen(unsigned long boot_phys_offset, /* Hide UART from DOM0 if we're using it */ serial_endboot(); =20 + if ( (rc =3D xsm_set_system_active()) !=3D 0 ) + panic("xsm(err=3D%d): " + "unable to set hypervisor to SYSTEM_ACTIVE privilege\n", err= ); + system_state =3D SYS_STATE_active; =20 for_each_domain( d ) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6f20e17892..36a60ce884 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -620,6 +620,11 @@ static void noreturn init_done(void) { void *va; unsigned long start, end; + int err; + + if ( (err =3D xsm_set_system_active()) !=3D 0 ) + panic("xsm(err=3D%d): " + "unable to set hypervisor to SYSTEM_ACTIVE privilege\n", err= ); =20 system_state =3D SYS_STATE_active; =20 diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 19ab678181..7b1c03a0e1 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 =3D SCHED_DEFAULT_RATELIMIT_US; } =20 - idle_domain =3D domain_create(DOMID_IDLE, NULL, 0); + /* + * The idle dom is created privileged to ensure unrestricted access du= ring + * setup and will be demoted by xsm_set_system_active() when setup is + * complete. + */ + idle_domain =3D 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 =3D idle_vcpu; diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 58afc1d589..3291fb5396 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -101,6 +101,23 @@ static always_inline int xsm_default_action( } } =20 +static XSM_INLINE int cf_check xsm_set_system_active(void) +{ + struct domain *d =3D current->domain; + + ASSERT(d->is_privileged); + + if ( d->domain_id !=3D DOMID_IDLE ) + { + printk("xsm_set_system_active: should only be called by idle domai= n\n"); + return -EPERM; + } + + d->is_privileged =3D false; + + return 0; +} + 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..8dad03fd3d 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 { + int (*set_system_active)(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; =20 #ifndef XSM_NO_WRAPPERS =20 +static inline int xsm_set_system_active(void) +{ + return alternative_call(xsm_ops.set_system_active); +} + 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..e6ffa948f7 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -14,6 +14,7 @@ #include =20 static const struct xsm_ops __initconst_cf_clobber dummy_ops =3D { + .set_system_active =3D xsm_set_system_active, .security_domaininfo =3D xsm_security_domaininfo, .domain_create =3D xsm_domain_create, .getdomaininfo =3D xsm_getdomaininfo, diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 0bf63ffa84..0bd4e8a4bd 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -186,6 +186,19 @@ static int cf_check flask_domain_alloc_security(struct= domain *d) return 0; } =20 +static int cf_check flask_set_system_active(void) +{ + struct domain *d =3D current->domain; + + if ( d->domain_id !=3D DOMID_IDLE ) + { + printk("xsm_set_system_active should only be called by idle domain= \n"); + return -EPERM; + } + + return 0; +} + static void cf_check flask_domain_free_security(struct domain *d) { struct domain_security_struct *dsec =3D d->ssid; @@ -1766,6 +1779,7 @@ static int cf_check flask_argo_send( #endif =20 static const struct xsm_ops __initconst_cf_clobber flask_ops =3D { + .set_system_active =3D flask_set_system_active, .security_domaininfo =3D flask_security_domaininfo, .domain_create =3D flask_domain_create, .getdomaininfo =3D flask_getdomaininfo, --=20 2.20.1 From nobody Sat May 11 20:24:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) ARC-Seal: i=2; a=rsa-sha256; t=1651498307; cv=pass; d=zohomail.com; s=zohoarc; b=MEwOK1I6JLZmz3SMEYG5B5tFMuNrQPbF+o2paPsPlqq/VaX+HcwuTX97B4iaZDdH48X9K+7U86GEloEPlMXyhmX9Fx5cw8kN/8xj6Uqu7r6E9/ZAINPHfunRwV/CWyBRWEZ44Kp7gbiSd21yCjfPHuHva/ZaTE9qBNa7bm7VqFY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651498307; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZbfrC0msVBpnGXM3HwSg5QOB6cUwWUSvu8aYMxskpQY=; b=GUBqw3SaY1AMpTpsMu1zA1qLg+OWX6toEaV5d7Nl4ofSwNFoztdaVt3N+QYIN2cfk32UoEdF0snPlYsx/ydo5YnDggMsrCUeXlt/ZsCxIAvSCFakaGqAjbmQmwW9gFUpBzm8125xELymQ5nUHbxUPgU38TaLxFOpyeExBfEn0CU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=apertussolutions.com) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1651498307522776.611245442727; Mon, 2 May 2022 06:31:47 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.318867.538830 (Exim 4.92) (envelope-from ) id 1nlW98-0006yj-Dj; Mon, 02 May 2022 13:31:26 +0000 Received: by outflank-mailman (output) from mailman id 318867.538830; Mon, 02 May 2022 13:31:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nlW98-0006yc-AR; Mon, 02 May 2022 13:31:26 +0000 Received: by outflank-mailman (input) for mailman id 318867; Mon, 02 May 2022 13:31:24 +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 1nlW96-0005cw-Iq for xen-devel@lists.xenproject.org; Mon, 02 May 2022 13:31:24 +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 1c3d68ff-ca1c-11ec-8fc4-03012f2f19d4; Mon, 02 May 2022 15:31:03 +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 16514982461731.2977082991415045; Mon, 2 May 2022 06:30:46 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 1c3d68ff-ca1c-11ec-8fc4-03012f2f19d4 ARC-Seal: i=1; a=rsa-sha256; t=1651498246; cv=none; d=zohomail.com; s=zohoarc; b=XYyluWAWk4ZcGjNZS93FXUQpZDcFdnWXW+SkqJ9NviJB5/gfqV5UX/uMkGh4h8hFtwJdu3quM9JoW03+3ZZsZvvVqsS+360glZwuBt3c9p8VxOMHmX17/oawN1i8ad4CXNfS7XTa5Tsi45lNoYFELXFF35OEZuF2/oiDKBikE70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651498246; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ZbfrC0msVBpnGXM3HwSg5QOB6cUwWUSvu8aYMxskpQY=; b=PY4CZrx7LZs3aXAUdpifPUKz6nLiV++YIgRS1fKRxF/V0IgIYNU8fhyMWBGDGI0fn3RNouEQ/xHn6AXQXgxjI4s7NlsC/HqU/EVlRobe47tEt14cDdiDMOioHwiKtTNnrL6THhASyvMB8PU13se94Lv76whPo+pOeUzEkr8QKYQ= 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=1651498246; 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=ZbfrC0msVBpnGXM3HwSg5QOB6cUwWUSvu8aYMxskpQY=; b=W9US/JzZQMO0Xg6ORq9ycIG05LC+9yQZXTuJCItvw86hm8okUPp7T/aD9IzUAjC2 lIWh9tw265Xm+bURIs7UrfHcqYgPphEcQMiD7JWNJpS1r1GSvGW2v9+gJ6Riz8Cz5lY iEbRSTgLkebaSxU/OFlQ54fgOmmilVOGvXUkOpIo= From: "Daniel P. Smith" To: xen-devel@lists.xenproject.org, "Daniel P. Smith" Cc: scott.davis@starlab.io, jandryuk@gmail.com, christopher.clark@starlab.io, Daniel De Graaf , Wei Liu , Anthony PERARD Subject: [PATCH v5 2/2] flask: implement xsm_set_system_active Date: Mon, 2 May 2022 09:30:27 -0400 Message-Id: <20220502133027.920-3-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220502133027.920-1-dpsmith@apertussolutions.com> References: <20220502133027.920-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-ZohoMail-DKIM: pass (identity dpsmith@apertussolutions.com) X-ZM-MESSAGEID: 1651498308766100001 Content-Type: text/plain; charset="utf-8" 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 wi= th at creation. It then provides the implementation for the XSM hook xsm_set_system_active 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 Reviewed-by: Jason Andryuk --- 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 | 8 +++++++- xen/xsm/flask/policy/initial_sids | 1 + 5 files changed, 16 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 }; ') =20 +# 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; ##########################################################################= ###### =20 # The hypervisor itself +type xenboot_t, xen_type, mls_priv; type xen_t, xen_type, mls_priv; =20 # Domain 0 diff --git a/tools/flask/policy/policy/initial_sids b/tools/flask/policy/po= licy/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 h= ave a # label defined in some other manner. =20 +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 0bd4e8a4bd..3e5d084276 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 =3D SECINITSID_XEN; + dsec->sid =3D SECINITSID_XENBOOT; break; case DOMID_XEN: dsec->sid =3D SECINITSID_DOMXEN; @@ -188,14 +188,20 @@ static int cf_check flask_domain_alloc_security(struc= t domain *d) =20 static int cf_check flask_set_system_active(void) { + struct domain_security_struct *dsec; struct domain *d =3D current->domain; =20 + dsec =3D d->ssid; + ASSERT(dsec->sid =3D=3D SECINITSID_XENBOOT); + if ( d->domain_id !=3D DOMID_IDLE ) { printk("xsm_set_system_active should only be called by idle domain= \n"); return -EPERM; } =20 + dsec->self_sid =3D dsec->sid =3D SECINITSID_XEN; + return 0; } =20 diff --git a/xen/xsm/flask/policy/initial_sids b/xen/xsm/flask/policy/initi= al_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=20 # +sid xenboot sid xen sid dom0 sid domio --=20 2.20.1