Adds starting the idle domain privileged
v8 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.
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 (2):
xsm: create idle domain privileged and demote after setup
flask: implement xsm_set_system_active
tools/flask/policy/modules/xen.if | 6 +++++ 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 | 32 +++++++++++++++++++++++++- xen/xsm/flask/policy/initial_sids | 1 + 11 files changed, 77 insertions(+), 2 deletions(-)
Signature · 1 line
2.20.1
PATCH v8 1/2 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
@@ -1048,6 +1048,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
@@ -620,6 +620,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
@@ -3021,7 +3021,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
@@ -186,6 +186,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;
@@ -1766,6 +1788,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
Re: [PATCH v8 1/2] xsm: create idle domain privileged and demote after setup
Quoted 19 lines · Daniel P. Smith
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 forxsm_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().
Quoted 4 lines
Signed-off-by Daniel P. Smith <[email protected]>Reviewed-by Jason Andryuk <[email protected]>Reviewed-by Luca Fancellu <[email protected]>
Hmm, here and on patch 2 you've lost Rahul's R-b and T-b, afaict.
Jan
Re: [PATCH v8 1/2] xsm: create idle domain privileged and demote after setup
Quoted 20 lines · Jan Beulich
Quoted 19 lines · Daniel P. Smith
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 forxsm_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().
Quoted 6 lines
Quoted 4 lines
Signed-off-by Daniel P. Smith <[email protected]>Reviewed-by Jason Andryuk <[email protected]>Reviewed-by Luca Fancellu <[email protected]>Hmm, here and on patch 2 you've lost Rahul's R-b and T-b, afaict.
erg, you are right, my apologies. Would you like me to respin as v9 to get it in there, so it is not lost?
v/r,
dps
Re: [PATCH v8 1/2] xsm: create idle domain privileged and demote after setup
Quoted 27 lines · Daniel P. Smith
Quoted 25 lines · Jan Beulich
Quoted 23 lines · Daniel P. Smith
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 forxsm_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 <[email protected]>Reviewed-by Jason Andryuk <[email protected]>Reviewed-by Luca Fancellu <[email protected]>
Quoted 4 lines
Quoted 1 line
Hmm, here and on patch 2 you've lost Rahul's R-b and T-b, afaict.
erg, you are right, my apologies. Would you like me to respin as v9 to get it in there, so it is not lost?
Not sure; much depends on who would commit this if this ends up being the final version. (If you re-send, I'd suggest v8.1 rather than v9.)
Jan
PATCH v8 2/2 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 | 6 ++++++ 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, 17 insertions(+), 1 deletion(-)
tools/flask/policy/modules/xen.if +6 -0
@@ -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', `
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
@@ -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,9 +188,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 ) {
@@ -205,6 +210,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
Re: [PATCH v8 2/2] flask: implement xsm_set_system_active
Quoted 11 lines · Daniel P. Smith
This commit implements full support for starting the idle domain privileged by introducing a new flask label
xenboot_twhich the idle domain is labeled with at creation. It then provides the implementation for the XSM hookxsm_set_system_activeto relabel the idle domain to the existingxen_tflask 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.
Quoted 4 lines
Signed-off-by Daniel P. Smith <[email protected]>Reviewed-by Jason Andryuk <[email protected]>Reviewed-by Luca Fancellu <[email protected]>Tested-by Luca Fancellu <[email protected]>
I am still debugging, but I now have a dom0 crashing due to an AVC that is being tripped with this patch applied to the tip of staging. I just wanted to give a heads-up, and I will follow back up once I can determine the root cause.
v/r,
dps
Re: [PATCH v8 2/2] flask: implement xsm_set_system_active
Quoted 17 lines · Daniel P. Smith
Quoted 11 lines · Daniel P. Smith
This commit implements full support for starting the idle domain privileged by introducing a new flask label
xenboot_twhich the idle domain is labeled with at creation. It then provides the implementation for the XSM hookxsm_set_system_activeto relabel the idle domain to the existingxen_tflask 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.Quoted 4 lines
Signed-off-by Daniel P. Smith <[email protected]>Reviewed-by Jason Andryuk <[email protected]>Reviewed-by Luca Fancellu <[email protected]>Tested-by Luca Fancellu <[email protected]>
Quoted 4 lines
I am still debugging, but I now have a dom0 crashing due to an AVC that is being tripped with this patch applied to the tip of staging. I just wanted to give a heads-up, and I will follow back up once I can determine the root cause.
Please ignore and my apologies for the noise. The updated policy file was not getting synced into the test environment.
v/r,
dps
Hi,
It seems that this series is stale for a while with author's action needed for Patch#1 [1] (and probably also need ack from flask maintainer for [2]). So this email is a gentle reminder about this series. Thanks!
[1] https://patchwork.kernel.org/project/xen-devel/patch/[email protected]/
[2] https://patchwork.kernel.org/project/xen-devel/patch/[email protected]/
Kind regards,
Henry
Quoted 70 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Daniel P. Smith
Subject: [PATCH v8 0/2] Adds starting the idle domain privilegedThis 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.Changes 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_sidDaniel P. Smith (2):
xsm: create idle domain privileged and demote after setup
flask: implementxsm_set_system_activetools/flask/policy/modules/xen.if | 6 +++++ 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 | 32 +++++++++++++++++++++++++- xen/xsm/flask/policy/initial_sids | 1 + 11 files changed, 77 insertions(+), 2 deletions(-)--
2.20.1