The build of xen-4.5.0-rc2 fails if XSM_ENABLE=y due to an inconsistency in commit fda1614 "xen/arm: Add support for GICv3 for domU" which uses XEN_DOMCTL_configure_domain in xen/xsm/flask/hooks.c and xen/xsm/flask/policy/access_vectors but XEN_DOMCTL_arm_configure_domain elsewhere.

        Michael Young
In fda1614 ("xen/arm: Add support for GICv3 for domU")
XEN_DOMCTL_configure_domain is used in xen/xsm/flask/hooks.c and
xen/xsm/flask/policy/access_vectors but XEN_DOMCTL_arm_configure_domain
is used elsewhere.

Signed-off-by: Michael Young <m.a.yo...@durham.ac.uk>

--- xen-4.5.0-rc2/xen/xsm/flask/hooks.c.orig    2014-11-11 14:40:20.000000000 
+0000
+++ xen-4.5.0-rc2/xen/xsm/flask/hooks.c 2014-11-11 18:46:52.926202919 +0000
@@ -727,7 +727,7 @@
     case XEN_DOMCTL_psr_cmt_op:
         return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CMT_OP);
 
-    case XEN_DOMCTL_configure_domain:
+    case XEN_DOMCTL_arm_configure_domain:
         return current_has_perm(d, SECCLASS_DOMAIN2, 
DOMAIN2__CONFIGURE_DOMAIN);
 
     default:
--- xen-4.5.0-rc2/xen/xsm/flask/policy/access_vectors.orig      2014-11-11 
14:40:20.000000000 +0000
+++ xen-4.5.0-rc2/xen/xsm/flask/policy/access_vectors   2014-11-11 
19:20:41.058175302 +0000
@@ -102,7 +102,7 @@
     unpause
 # XEN_DOMCTL_resumedomain
     resume
-# XEN_DOMCTL_createdomain
+# XEN_DOMCTL_arm_createdomain
     create
 # checked in FLASK_RELABEL_DOMAIN for any relabel operation:
 #  source = the old label of the domain
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Reply via email to