Adds starting the idle domain privileged
v5 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 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 | 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 | 22 +++++++++++++++++++++- xen/xsm/flask/policy/initial_sids | 1 + 11 files changed, 69 insertions(+), 2 deletions(-)
Signature · 1 line
2.20.1
PATCH v5 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. 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 | 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(-)
xen/arch/arm/setup.c +4 -0
@@ -1048,6 +1048,10 @@ 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(err=%d): " +"unable to set hypervisor to SYSTEM_ACTIVE privilege\n" , err); + system_state = SYS_STATE_active;for_each_domain ( d )
xen/arch/x86/setup.c +5 -0
@@ -620,6 +620,11 @@ static void noreturn init_done(void) {void *va;unsigned long start, end; +int err; + +if ( (err =xsm_set_system_active ()) !=0 ) +panic ("xsm(err=%d): " +"unable to set hypervisor to SYSTEM_ACTIVE privilege\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 ("xsm_set_system_active: should only be called by idle domain\n" ); +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 +14 -0
@@ -186,6 +186,19 @@ 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; + +if ( d->domain_id !=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 = d->ssid;
@@ -1766,6 +1779,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 v5 1/2] xsm: create idle domain privileged and demote after setup
xen/arch/arm/setup.c void __init start_xen(unsigned long boot_phys_offset, · line 1053
Quoted 11 lines · Daniel P. Smith
xen/arch/arm/setup.c +3
-0@@ -1048,6 +1048,10 @@ 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(err=%d): " +"unable to set hypervisor to SYSTEM_ACTIVE privilege\n" , err);
You want to print rc in this message.
Regards,
Jason
Re: [PATCH v5 1/2] xsm: create idle domain privileged and demote after setup
Quoted 10 lines · Jason Andryuk
Quoted 8 lines · Daniel P. Smith
xen/arch/arm/setup.c +0
-0@@ -1048,6 +1048,10 @@ void __init start_xen(unsigned long boot_phys_offset,/* Hide UART from DOM0 if we're using it */ serial_endboot ();
Quoted 5 lines
xen/arch/arm/setup.c void __init start_xen(unsigned long boot_phys_offset, · line 1053
Quoted 3 lines
xen/arch/arm/setup.c +3
-0+if ( (rc =xsm_set_system_active ()) !=0 ) +panic ("xsm(err=%d): " +"unable to set hypervisor to SYSTEM_ACTIVE privilege\n" , err);You want to print rc in this message.
Thanks, but now I want to figure out how that compiled.
v/r,
dps
Re: [PATCH v5 1/2] xsm: create idle domain privileged and demote after setup
Quoted 11 lines · Daniel P. Smith
Quoted 10 lines · Jason Andryuk
Quoted 8 lines · Daniel P. Smith
xen/arch/arm/setup.c +0
-0@@ -1048,6 +1048,10 @@ void __init start_xen(unsigned long boot_phys_offset,/* Hide UART from DOM0 if we're using it */ serial_endboot ();
Quoted 7 lines
Quoted 5 lines
xen/arch/arm/setup.c void __init start_xen(unsigned long boot_phys_offset, · line 1053
Quoted 3 lines
xen/arch/arm/setup.c +3
-0+if ( (rc =xsm_set_system_active ()) !=0 ) +panic ("xsm(err=%d): " +"unable to set hypervisor to SYSTEM_ACTIVE privilege\n" , err);You want to print rc in this message.
Thanks, but now I want to figure out how that compile
Ah, arm which I do not have a build env to do build tests.
v/r,
dps
Luca Fancellu
Reviewed-byRe: [PATCH v5 1/2] xsm: create idle domain privileged and demote after setup
Quoted 22 lines · Daniel P. Smith
Quoted 17 lines · Daniel P. Smith
Quoted 15 lines · Jason Andryuk
xen/arch/arm/setup.c void __init start_xen(unsigned long boot_phys_offset, · line 1053
Quoted 11 lines · Daniel P. Smith
xen/arch/arm/setup.c +3
-0@@ -1048,6 +1048,10 @@ 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(err=%d): " +"unable to set hypervisor to SYSTEM_ACTIVE privilege\n" , err);You want to print rc in this message.
Quoted 3 lines
Quoted 1 line
Thanks, but now I want to figure out how that compile
Ah, arm which I do not have a build env to do build tests.
I’ve built this patch on arm (changing err to rc), everything looks fine, so with that addressed:
Quoted 5 lines
v/r,
dps
Re: [PATCH v5 1/2] xsm: create idle domain privileged and demote after setup
Quoted 22 lines · Luca Fancellu
Quoted 22 lines · Daniel P. Smith
Quoted 17 lines · Daniel P. Smith
Quoted 15 lines · Jason Andryuk
xen/arch/arm/setup.c void __init start_xen(unsigned long boot_phys_offset, · line 1053
Quoted 11 lines · Daniel P. Smith
xen/arch/arm/setup.c +3
-0@@ -1048,6 +1048,10 @@ 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(err=%d): " +"unable to set hypervisor to SYSTEM_ACTIVE privilege\n" , err);You want to print rc in this message.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Thanks, but now I want to figure out how that compile
Ah, arm which I do not have a build env to do build tests.
I’ve built this patch on arm (changing err to rc), everything looks fine, so with that addressed:
Reviewed-by Luca Fancellu <[email protected]>
Thank you and my apologies for not adding your review-by this morning. I had v6 queued to go out last night and missed this email before releasing.
Re: [PATCH v5 1/2] xsm: create idle domain privileged and demote after setup
Quoted 31 lines · Daniel P. Smith
Quoted 26 lines · Luca Fancellu
Quoted 25 lines · Daniel P. Smith
Quoted 11 lines · Daniel P. Smith
Quoted 10 lines · Jason Andryuk
Quoted 8 lines · Daniel P. Smith
xen/arch/arm/setup.c +0
-0@@ -1048,6 +1048,10 @@ void __init start_xen(unsigned long boot_phys_offset,/* Hide UART from DOM0 if we're using it */ serial_endboot ();Quoted 7 lines
Quoted 5 lines
xen/arch/arm/setup.c void __init start_xen(unsigned long boot_phys_offset, · line 1053
Quoted 3 lines
xen/arch/arm/setup.c +3
-0+if ( (rc =xsm_set_system_active ()) !=0 ) +panic ("xsm(err=%d): " +"unable to set hypervisor to SYSTEM_ACTIVE privilege\n" , err);You want to print rc in this message.
Thanks, but now I want to figure out how that compile
Ah, arm which I do not have a build env to do build tests.
Quoted 8 lines
Quoted 4 lines
I’ve built this patch on arm (changing err to rc), everything looks fine, so with that addressed:
Reviewed-by Luca Fancellu <[email protected]>Thank you and my apologies for not adding your review-by this morning. I had v6 queued to go out last night and missed this email before releasing.
Hi Daniel,
It’s ok I will put it again in the new serie.
Cheers,
Luca
PATCH v5 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 | 8 +++++++- xen/xsm/flask/policy/initial_sids | 1 + 5 files changed, 16 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 +7 -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,14 +188,20 @@ 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 (dsec->sid ==SECINITSID_XENBOOT ); +if ( d->domain_id !=DOMID_IDLE ) {printk ("xsm_set_system_active should only be called by idle domain\n" );return -EPERM ; } + 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 v5 2/2] flask: implement xsm_set_system_active
Quoted 7 lines · Daniel P. Smith
xen/xsm/flask/hooks.c +1
-0@@ -188,14 +188,20 @@ 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;
xen/xsm/flask/hooks.c static int cf_check flask_domain_alloc_security(struct domain *d) · line 203
Quoted 10 lines
xen/xsm/flask/hooks.c +4
-0+ dsec = d->ssid; +ASSERT (dsec->sid ==SECINITSID_XENBOOT ); +if ( d->domain_id !=DOMID_IDLE ) {printk ("xsm_set_system_active should only be called by idle domain\n" );return -EPERM ; } + dsec->self_sid = dsec->sid =SECINITSID_XEN ;
I think you want to re-add setting is_privileged to false. I think from the other thread Roger just thought it should also have the matching assert. It doesn't matter for flask decisions, but it changes the return of is_control_domain. It seems to me it would be better to have idle domains consistent between flask and non-flask instead of having a potentially subtle difference.
Regards,
Jason
Re: [PATCH v5 2/2] flask: implement xsm_set_system_active
In reply to Daniel P. Smithxen/xsm/flask/hooks.c static int cf_check flask_domain_alloc_security(struct domain *d) · line 195
Quoted 9 lines · Daniel P. Smith
xen/xsm/flask/hooks.c +3
-0@@ -188,14 +188,20 @@ 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 (dsec->sid ==SECINITSID_XENBOOT );
What about ->self_sid, which ...
xen/xsm/flask/hooks.c static int cf_check flask_domain_alloc_security(struct domain *d) · line 203
Quoted 8 lines
xen/xsm/flask/hooks.c +2
-0+if ( d->domain_id !=DOMID_IDLE ) {printk ("xsm_set_system_active should only be called by idle domain\n" );return -EPERM ; } + dsec->self_sid = dsec->sid =SECINITSID_XEN ;
... you also overwrite here?
Jan