Adds starting the idle domain privileged
v10 cover Adds starting the idle domain privileged
This series makes it so that the idle domain is started privileged under the default policy, which the SILO policy inherits, and under the flask policy. It then introduces a new one-way XSM hook, xsm_transition_running, that is hooked by an XSM policy to transition the idle domain to its running privilege level.
Patch 3 is an important one, as first it addresses the issue raised under an RFC late last year by Jason Andryuk regarding the awkward entanglement of flask_domain_alloc_security() and flask_domain_create(). Second, it helps articulate why it is that the hypervisor should go through the access control checks, even when it is doing the action itself. The issue at hand is not that the hypervisor could be influenced to go around these check. The issue is these checks provides a configurable way to express the execution flow that the hypervisor should enforce. Specifically with this change, it is now possible for an owner of a dom0less or hyperlaunch system to express a policy where the hypervisor will enforce that no dom0 will be constructed, regardless of what boot construction details were provided to it. Likewise, an owner that does not want to see dom0less or hyperlaunch to be used can enforce that the hypervisor will only construct a dom0 domain. This can all be accomplished without the need to rebuild the hypervisor with these features enabled or disabled.
Changes in v10:
- rewrote patch 3 commit message
- fixed typos in patch 3
- reworked logic in flask_domain_create() to be simpler and not result in changing the domain security struct before the access check fails
Changes in v9:
- added missing Rb/Tb to patch 1
- corrected the flask policy macro in patch 2 to allow domain create
- added patch 3 to address allowing the hypervisor create more than 1 domain
Changes in v8:
- adjusted panic messages in arm and x86 setup.c to be less than 80cols
- fixed comment line that went over 80col
- added line in patch #1 commit message to clarify the need is for domain creation
Changes in v7:
- adjusted error message in default and flask xsm_set_system_active hooks
- merged panic messages in arm and x86 setup.c to a single line
Changes in v6:
- readded the setting of is_privileged in flask_set_system_active()
- clarified comment on is_privileged in flask_set_system_active()
- added ASSERT on is_privileged and self_sid in flask_set_system_active()
- fixed err code returned on Arm for xsm_set_system_active() panic message
Changes in v5:
- dropped setting is_privileged in flask_set_system_active()
- added err code returned by xsm_set_system_active() to panic message
Changes in v4:
- reworded patch 1 commit messaged
- fixed whitespace to coding style
- fixed comment to coding style
Changes in v3:
- renamed *_transition_running() to *_set_system_active()
- changed the XSM hook set_system_active() from void to int return
- added ASSERT check for the expected privilege level each XSM policy expected
- replaced a check against is_privileged in each arch with checking the return value from the call to xsm_set_system_active()
Changes in v2:
- renamed flask_domain_runtime_security() to flask_transition_running()
- added the missed assignment of self_sid
Daniel P. Smith (3):
xsm: create idle domain privileged and demote after setup
flask: implement xsm_set_system_active
xsm: refactor flask sid alloc and domain check
tools/flask/policy/modules/dom0.te | 3 ++ tools/flask/policy/modules/domU.te | 3 ++ tools/flask/policy/modules/xen.if | 7 +++ tools/flask/policy/modules/xen.te | 1 + tools/flask/policy/policy/initial_sids | 1 + xen/arch/arm/setup.c | 3 ++ xen/arch/x86/setup.c | 4 ++ 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 | 67 ++++++++++++++++++++------ xen/xsm/flask/policy/initial_sids | 1 + 13 files changed, 104 insertions(+), 17 deletions(-)
Signature · 1 line
2.20.1
PATCH v10 1/3 xsm: create idle domain privileged and demote after setup
There are new capabilities, dom0less and hyperlaunch, that introduce internal hypervisor logic, which needs to make resource allocation calls that are protected by XSM access checks. The need for these resource allocations are necessary for dom0less and hyperlaunch when they are constructing the initial domain(s). 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 the 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 demote 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().
--- xen/arch/arm/setup.c | 3 +++ xen/arch/x86/setup.c | 4 ++++ 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 | 23 +++++++++++++++++++++++ 7 files changed, 60 insertions(+), 1 deletion(-)
xen/arch/arm/setup.c +3 -0
@@ -1063,6 +1063,9 @@ void __init start_xen(unsigned long boot_phys_offset,/* Hide UART from DOM0 if we're using it */ serial_endboot (); +if ( (rc =xsm_set_system_active ()) !=0 ) +panic ("xsm: unable to switch to SYSTEM_ACTIVE privilege: %d\n" , rc); + system_state = SYS_STATE_active;for_each_domain ( d )
xen/arch/x86/setup.c +4 -0
@@ -619,6 +619,10 @@ static void noreturn init_done(void) {void *va;unsigned long start, end; +int err; + +if ( (err =xsm_set_system_active ()) !=0 ) +panic ("xsm: unable to switch to SYSTEM_ACTIVE privilege: %d\n" , err); system_state = SYS_STATE_active;
xen/common/sched/core.c +6 -1
@@ -3033,7 +3033,12 @@ void __init scheduler_init(void) sched_ratelimit_us =SCHED_DEFAULT_RATELIMIT_US ; } - idle_domain =domain_create (DOMID_IDLE ,NULL ,0 ); +/* +* The idle dom is created privileged to ensure unrestricted access during +* setup and will be demoted by xsm_set_system_active() 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;
xen/include/xsm/dummy.h +17 -0
@@ -101,6 +101,23 @@ static always_inline int xsm_default_action( } } +static XSM_INLINE int cf_check xsm_set_system_active(void) +{ +struct domain *d = current->domain; + +ASSERT (d->is_privileged); + +if ( d->domain_id !=DOMID_IDLE ) + { +printk ("%s: should only be called by idle domain\n" , __func__); +return -EPERM ; + } + + d->is_privileged = false; + +return 0 ; +} + static XSM_INLINE void cf_check xsm_security_domaininfo(struct domain *d,struct xen_domctl_getdomaininfo *info) {
xen/include/xsm/xsm.h +6 -0
@@ -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;#ifndef XSM_NO_WRAPPERS +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) {
xen/xsm/dummy.c +1 -0
@@ -14,6 +14,7 @@#include <xsm/dummy.h> static const struct xsm_ops __initconst_cf_clobber dummy_ops = { + .set_system_active = xsm_set_system_active, .security_domaininfo = xsm_security_domaininfo, .domain_create = xsm_domain_create, .getdomaininfo = xsm_getdomaininfo,
xen/xsm/flask/hooks.c +23 -0
@@ -191,6 +191,28 @@ static int cf_check flask_domain_alloc_security(struct domain *d)return 0 ; } +static int cf_check flask_set_system_active(void) +{ +struct domain *d = current->domain; + +ASSERT (d->is_privileged); + +if ( d->domain_id !=DOMID_IDLE ) + { +printk ("%s: should only be called by idle domain\n" , __func__); +return -EPERM ; + } + +/* +* While is_privileged has no significant meaning under flask, set to false +* as is_privileged is not only used for a privilege check but also as a +* type of domain check, specifically if the domain is the control domain. +*/ + d->is_privileged = false; + +return 0 ; +} + static void cf_check flask_domain_free_security(struct domain *d) {struct domain_security_struct *dsec = d->ssid;
@@ -1774,6 +1796,7 @@ static int cf_check flask_argo_send(#endif static const struct xsm_ops __initconst_cf_clobber flask_ops = { + .set_system_active = flask_set_system_active, .security_domaininfo = flask_security_domaininfo, .domain_create = flask_domain_create, .getdomaininfo = flask_getdomaininfo,
Signature · 1 line
2.20.1
PATCH v10 2/3 flask: implement xsm_set_system_active
In reply to Daniel P. SmithThis 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_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.
--- tools/flask/policy/modules/xen.if | 7 +++++++ tools/flask/policy/modules/xen.te | 1 + tools/flask/policy/policy/initial_sids | 1 + xen/xsm/flask/hooks.c | 9 ++++++++- xen/xsm/flask/policy/initial_sids | 1 + 5 files changed, 18 insertions(+), 1 deletion(-)
tools/flask/policy/modules/xen.if +7 -0
@@ -62,6 +62,13 @@ 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:domain create; + allow xenboot_t $1_channel:event create; +') + # create_domain(priv, target) # Allow a domain to be created directly define(`create_domain', `
tools/flask/policy/modules/xen.te +1 -0
@@ -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
tools/flask/policy/policy/initial_sids +1 -0
@@ -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)
xen/xsm/flask/hooks.c +8 -1
@@ -173,7 +173,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 ;
@@ -193,9 +193,14 @@ static int cf_check flask_domain_alloc_security(struct domain *d) static int cf_check flask_set_system_active(void) { +struct domain_security_struct *dsec;struct domain *d = current->domain; + dsec = d->ssid; +ASSERT (d->is_privileged); +ASSERT (dsec->sid ==SECINITSID_XENBOOT ); +ASSERT (dsec->self_sid ==SECINITSID_XENBOOT );if ( d->domain_id !=DOMID_IDLE ) {
@@ -210,6 +215,8 @@ static int cf_check flask_set_system_active(void)*/ d->is_privileged = false; + dsec->self_sid = dsec->sid =SECINITSID_XEN ; +return 0 ; }
xen/xsm/flask/policy/initial_sids +1 -0
@@ -3,6 +3,7 @@ # # Define initial security identifiers # +sid xenboot sid xen sid dom0 sid domio
Signature · 1 line
2.20.1
PATCH v10 3/3 xsm: refactor flask sid alloc and domain check
In reply to Daniel P. SmithThe function flask_domain_alloc_security() allocates the security context and assigns an initial SID for the domain under construction. When it came to SID assignment of the initial domain, flask_domain_alloc_security() would assign unlabeled_t. Then in flask_domain_create() it would be switched to dom0_t. This logic worked under the assumption that the first domain constructed would be the hypervisor constructing dom0 and all other domains would be constructed by a toolstack, which would provide a SID. The introduction of dom0less and subsequently hyperlaunch violates this assumption, as non-privileged domain may be constructed before the initial domain or no initial domain may be constructed at all. It is not possible currently for dom0less to express domain labels in the domain configuration, as such the FLASK policy must employ a sensible initial SID assignment that can differentiate between hypervisor and toolstack domain construction. With the introduction of xenboot_t it is now possible to distinguish when the hypervisor is in the boot state, and thus any domain construction happening at this time is being initiated by the hypervisor.
This commit addresses the above situation by using a check to confirm if the hypervisor is under the xenboot_t context in flask_domain_alloc_security(). When that is the case, it will inspect the domain's is_privileged field to determine whether an initial label of dom0_t or domU_t should be set for the domain. The logic for flask_domain_create() was changed to allow the incoming SID to override the initial label.
The base policy was adjusted to allow the idle domain under the xenboot_t context the ability to construct domains of both types, dom0_t and domu_t.
--- tools/flask/policy/modules/dom0.te | 3 +++ tools/flask/policy/modules/domU.te | 3 +++ xen/xsm/flask/hooks.c | 35 +++++++++++++++++------------- 3 files changed, 26 insertions(+), 15 deletions(-)
tools/flask/policy/modules/dom0.te +3 -0
@@ -75,3 +75,6 @@ admin_device(dom0_t, ioport_t) admin_device(dom0_t, iomem_t) domain_comms(dom0_t, dom0_t) + +# Allow the hypervisor to build domains of type dom0_t +xen_build_domain(dom0_t)
tools/flask/policy/modules/domU.te +3 -0
@@ -13,6 +13,9 @@ domain_comms(domU_t, domU_t) migrate_domain_out(dom0_t, domU_t) domain_self_comms(domU_t) +# Allow the hypervisor to build domains of type domU_t +xen_build_domain(domU_t) + # Device model for domU_t. You can define distinct types for device models for # domains of other types, or add more make_device_model lines for this type. declare_domain(dm_dom_t)
xen/xsm/flask/hooks.c +20 -15
@@ -182,7 +182,15 @@ static int cf_check flask_domain_alloc_security(struct domain *d) dsec->sid =SECINITSID_DOMIO ;break ;default : - dsec->sid =SECINITSID_UNLABELED ; +if (domain_sid (current->domain) ==SECINITSID_XENBOOT ) + { +if ( d->is_privileged ) + dsec->sid =SECINITSID_DOM0 ; +else + dsec->sid =SECINITSID_DOMU ; + } +else + dsec->sid =SECINITSID_UNLABELED ; } dsec->self_sid = dsec->sid;
@@ -548,22 +556,19 @@ static int cf_check flask_domain_create(struct domain *d, uint32_t ssidref) {int rc;struct domain_security_struct *dsec = d->ssid; -static int dom0_created =0 ; -if (is_idle_domain (current->domain) && !dom0_created ) - { - dsec->sid =SECINITSID_DOM0 ; - dom0_created =1 ; - } -else - { - rc =avc_current_has_perm (ssidref,SECCLASS_DOMAIN , -DOMAIN__CREATE ,NULL ); -if ( rc ) -return rc; +/* +* If the null label is passed, then use the label from security context +* allocation. +*/ +if ( ssidref ==0 ) + ssidref = dsec->sid; - dsec->sid = ssidref; - } + rc =avc_current_has_perm (ssidref,SECCLASS_DOMAIN ,DOMAIN__CREATE ,NULL ); +if ( rc ) +return rc; + + dsec->sid = ssidref; dsec->self_sid = dsec->sid; rc = security_transition_sid(dsec->sid, dsec->sid, SECCLASS_DOMAIN,
Signature · 1 line
2.20.1
Quoted 63 lines · Daniel P. Smith
This series makes it so that the idle domain is started privileged under the default policy, which the SILO policy inherits, and under the flask policy. It then introduces a new one-way XSM hook,
xsm_transition_running, that is hooked by an XSM policy to transition the idle domain to its running privilege level.Patch 3 is an important one, as first it addresses the issue raised under an RFC late last year by Jason Andryuk regarding the awkward entanglement of
flask_domain_alloc_security()andflask_domain_create(). Second, it helps articulate why it is that the hypervisor should go through the access control checks, even when it is doing the action itself. The issue at hand is not that the hypervisor could be influenced to go around these check. The issue is these checks provides a configurable way to express the execution flow that the hypervisor should enforce. Specifically with this change, it is now possible for an owner of a dom0less or hyperlaunch system to express a policy where the hypervisor will enforce that no dom0 will be constructed, regardless of what boot construction details were provided to it. Likewise, an owner that does not want to see dom0less or hyperlaunch to be used can enforce that the hypervisor will only construct a dom0 domain. This can all be accomplished without the need to rebuild the hypervisor with these features enabled or disabled.Changes in v10:
- rewrote patch 3 commit message
- fixed typos in patch 3
- reworked logic inflask_domain_create()to be simpler and not result in changing the domain security struct before the access check failsChanges in v9:
- added missing Rb/Tb to patch 1
- corrected the flask policy macro in patch 2 to allow domain create
- added patch 3 to address allowing the hypervisor create more than 1 domainChanges in v8:
- adjusted panic messages in arm and x86setup.cto be less than 80cols
- fixed comment line that went over 80col
- added line in patch #1 commit message to clarify the need is for domain creationChanges in v7:
- adjusted error message in default and flaskxsm_set_system_activehooks
- merged panic messages in arm and x86setup.cto a single lineChanges in v6:
- readded the setting ofis_privilegedinflask_set_system_active()
- clarified comment onis_privilegedinflask_set_system_active()
- added ASSERT onis_privilegedandself_sidinflask_set_system_active()
- fixed err code returned on Arm forxsm_set_system_active()panic messageChanges in v5:
- dropped settingis_privilegedinflask_set_system_active()
- added err code returned byxsm_set_system_active()to panic messageChanges in v4:
- reworded patch 1 commit messaged
- fixed whitespace to coding style
- fixed comment to coding styleChanges in v3:
- renamed*_transition_running()to*_set_system_active()
- changed the XSM hookset_system_active()from void to int return
- added ASSERT check for the expected privilege level each XSM policy expected
- replaced a check againstis_privilegedin each arch with checking the return value from the call toxsm_set_system_active()
Quoted 7 lines
Changes in v2:
- renamedflask_domain_runtime_security()toflask_transition_running()
- added the missed assignment ofself_sidDaniel P. Smith (3):
xsm: create idle domain privileged and demote after setup
flask: implementxsm_set_system_active
Against what tree is this series? These two patches look to be in staging already (and they have been there for almost a month), so if there are incremental changes to make, please send incremental patches. Otherwise please clarify whether ...
Quoted 1 line
xsm: refactor flask sid alloc and domain check
... this change alone was meant to be (re)submitted.
Jan
Quoted 68 lines · Jan Beulich
Quoted 67 lines · Daniel P. Smith
This series makes it so that the idle domain is started privileged under the default policy, which the SILO policy inherits, and under the flask policy. It then introduces a new one-way XSM hook,
xsm_transition_running, that is hooked by an XSM policy to transition the idle domain to its running privilege level.Patch 3 is an important one, as first it addresses the issue raised under an RFC late last year by Jason Andryuk regarding the awkward entanglement of
flask_domain_alloc_security()andflask_domain_create(). Second, it helps articulate why it is that the hypervisor should go through the access control checks, even when it is doing the action itself. The issue at hand is not that the hypervisor could be influenced to go around these check. The issue is these checks provides a configurable way to express the execution flow that the hypervisor should enforce. Specifically with this change, it is now possible for an owner of a dom0less or hyperlaunch system to express a policy where the hypervisor will enforce that no dom0 will be constructed, regardless of what boot construction details were provided to it. Likewise, an owner that does not want to see dom0less or hyperlaunch to be used can enforce that the hypervisor will only construct a dom0 domain. This can all be accomplished without the need to rebuild the hypervisor with these features enabled or disabled.Changes in v10:
- rewrote patch 3 commit message
- fixed typos in patch 3
- reworked logic inflask_domain_create()to be simpler and not result in changing the domain security struct before the access check failsChanges in v9:
- added missing Rb/Tb to patch 1
- corrected the flask policy macro in patch 2 to allow domain create
- added patch 3 to address allowing the hypervisor create more than 1 domainChanges in v8:
- adjusted panic messages in arm and x86setup.cto be less than 80cols
- fixed comment line that went over 80col
- added line in patch #1 commit message to clarify the need is for domain creationChanges in v7:
- adjusted error message in default and flaskxsm_set_system_activehooks
- merged panic messages in arm and x86setup.cto a single lineChanges in v6:
- readded the setting ofis_privilegedinflask_set_system_active()
- clarified comment onis_privilegedinflask_set_system_active()
- added ASSERT onis_privilegedandself_sidinflask_set_system_active()
- fixed err code returned on Arm forxsm_set_system_active()panic messageChanges in v5:
- dropped settingis_privilegedinflask_set_system_active()
- added err code returned byxsm_set_system_active()to panic messageChanges in v4:
- reworded patch 1 commit messaged
- fixed whitespace to coding style
- fixed comment to coding styleChanges in v3:
- renamed*_transition_running()to*_set_system_active()
- changed the XSM hookset_system_active()from void to int return
- added ASSERT check for the expected privilege level each XSM policy expected
- replaced a check againstis_privilegedin each arch with checking the return value from the call toxsm_set_system_active()Changes in v2:
- renamedflask_domain_runtime_security()toflask_transition_running()
- added the missed assignment ofself_sid
Quoted 8 lines
Quoted 3 lines
Daniel P. Smith (3):
xsm: create idle domain privileged and demote after setup
flask: implementxsm_set_system_activeAgainst what tree is this series? These two patches look to be in staging already (and they have been there for almost a month), so if there are incremental changes to make, please send incremental patches. Otherwise please clarify whether ...
No changes in the first two patches, just forgot to rebase on stable. I will resend patch 3 standalone, which turns out to be good, as there is one more adjustment I feel is needed after looking back at hyperlaunch test cases.
v/r,
dps