From: Wei Liu Date: Thu, 25 Jan 2018 13:14:24 +0000 (+0000) Subject: xen: Fix xsm build after [g]cov renaming X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~688 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=76dcdb75b7cc9e7e8470e711db14bbbd3ae92415;p=xen.git xen: Fix xsm build after [g]cov renaming Commit e8d461497d9 renamed gcov_op to coverage_op but forgot to change XSM handles. Signed-off-by: Wei Liu Acked-by: Andrew Cooper Reviewed-by: Roger Pau Monné Acked-by: Ian Jackson --- diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index 07de3d5083..bf794d9bdd 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -16,7 +16,7 @@ allow dom0_t xen_t:xen { allow dom0_t xen_t:xen2 { resource_op psr_cmt_op psr_alloc pmu_ctrl get_symbol get_cpu_levelling_caps get_cpu_featureset livepatch_op - gcov_op set_parameter + coverage_op set_parameter }; # Allow dom0 to use all XENVER_ subops that have checks. diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 835b3d1a03..3533259f9f 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -825,9 +825,9 @@ static int flask_sysctl(int cmd) case XEN_SYSCTL_livepatch_op: return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, XEN2__LIVEPATCH_OP, NULL); - case XEN_SYSCTL_gcov_op: + case XEN_SYSCTL_coverage_op: return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, - XEN2__GCOV_OP, NULL); + XEN2__COVERAGE_OP, NULL); case XEN_SYSCTL_set_parameter: return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, XEN2__SET_PARAMETER, NULL); diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 50dfc36c1c..e74d98d736 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -99,8 +99,8 @@ class xen2 get_cpu_featureset # XEN_SYSCTL_livepatch_op livepatch_op -# XEN_SYSCTL_gcov_op - gcov_op +# XEN_SYSCTL_coverage_op + coverage_op # XEN_SYSCTL_set_parameter set_parameter }