aboutsummaryrefslogtreecommitdiffstats
path: root/tools/flask
diff options
context:
space:
mode:
authorDaniel De Graaf <dgdegra@tycho.nsa.gov>2012-02-02 15:21:42 +0000
committerDaniel De Graaf <dgdegra@tycho.nsa.gov>2012-02-02 15:21:42 +0000
commitc14a9b21171a7dd847188b3f882cf9efd490c414 (patch)
tree21903f29ba37a1c6db6f9d81d498ff8f09391c5c /tools/flask
parenta15e8b800a7dc62b1edc4314856dbc8f5003a28a (diff)
downloadxen-c14a9b21171a7dd847188b3f882cf9efd490c414.tar.gz
xen-c14a9b21171a7dd847188b3f882cf9efd490c414.tar.bz2
xen-c14a9b21171a7dd847188b3f882cf9efd490c414.zip
flask/policy: use declare_domain for dom0_t
Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov> Committed-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'tools/flask')
-rw-r--r--tools/flask/policy/policy/modules/xen/xen.if4
-rw-r--r--tools/flask/policy/policy/modules/xen/xen.te4
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if
index 3065718927..dde7f90e44 100644
--- a/tools/flask/policy/policy/modules/xen/xen.if
+++ b/tools/flask/policy/policy/modules/xen/xen.if
@@ -5,10 +5,10 @@
# Domain creation and setup
#
################################################################################
-# declare_domain(type)
+# declare_domain(type, attrs...)
# Declare a type as a domain type, and allow basic domain setup
define(`declare_domain', `
- type $1, domain_type;
+ type $1, domain_type`'ifelse(`$#', `1', `', `,shift($@)');
allow $1 $1:grant { query setup };
allow $1 $1:mmu { adjust physmap map_read map_write stat pinpage };
allow $1 $1:hvm { getparam setparam };
diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te
index 67dd0dfa88..fb71b757ca 100644
--- a/tools/flask/policy/policy/modules/xen/xen.te
+++ b/tools/flask/policy/policy/modules/xen/xen.te
@@ -25,7 +25,7 @@ attribute mls_priv;
type xen_t, xen_type, mls_priv;
# Domain 0
-type dom0_t, domain_type, mls_priv;
+declare_domain(dom0_t, mls_priv);
# Untracked I/O memory (pseudo-domain)
type domio_t, xen_type;
@@ -63,8 +63,6 @@ allow dom0_t security_t:security { check_context compute_av compute_create
setbool setsecparam add_ocontext del_ocontext };
allow dom0_t dom0_t:domain { getdomaininfo getvcpuinfo getvcpuaffinity };
-allow dom0_t dom0_t:grant { query setup };
-allow dom0_t dom0_t:mmu { adjust physmap map_read map_write stat pinpage };
allow dom0_t dom0_t:resource { add remove };
admin_device(dom0_t, device_t)