From: Andrew Cooper Date: Fri, 26 Jan 2018 19:33:40 +0000 (+0000) Subject: xen: Fix XSM build after dropping XEN_DOMCTL_getmemlist X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~669 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0252bcf32d4f193d5a077342ca62fe16b6731b58;p=xen.git xen: Fix XSM build after dropping XEN_DOMCTL_getmemlist c/s 94450e36bfbb removed XEN_DOMCTL_getmemlist entirely, but missed adjusting the XSM side of things. As far as I can tell, 'pagelist' wasn't even offered to dom0 in default policy. Also, drop the stale struct xen_domctl_getmemlist which was missed from the same changeset. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Daniel De Graaf --- diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index fb8b9379ff..ec7a860afc 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -122,19 +122,6 @@ typedef struct xen_domctl_getdomaininfo xen_domctl_getdomaininfo_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_getdomaininfo_t); -/* XEN_DOMCTL_getmemlist */ -struct xen_domctl_getmemlist { - /* IN variables. */ - /* Max entries to write to output buffer. */ - uint64_aligned_t max_pfns; - /* Start index in guest's page list. */ - uint64_aligned_t start_pfn; - XEN_GUEST_HANDLE_64(uint64) buffer; - /* OUT variables. */ - uint64_aligned_t num_pfns; -}; - - /* XEN_DOMCTL_getpageframeinfo */ #define XEN_DOMCTL_PFINFO_LTAB_SHIFT 28 @@ -1194,7 +1181,6 @@ struct xen_domctl { union { struct xen_domctl_createdomain createdomain; struct xen_domctl_getdomaininfo getdomaininfo; - struct xen_domctl_getmemlist getmemlist; struct xen_domctl_getpageframeinfo3 getpageframeinfo3; struct xen_domctl_nodeaffinity nodeaffinity; struct xen_domctl_vcpuaffinity vcpuaffinity; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 3533259f9f..1802d8dfe6 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -669,9 +669,6 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_getpageframeinfo3: return current_has_perm(d, SECCLASS_MMU, MMU__PAGEINFO); - case XEN_DOMCTL_getmemlist: - return current_has_perm(d, SECCLASS_MMU, MMU__PAGELIST); - case XEN_DOMCTL_hypercall_init: return current_has_perm(d, SECCLASS_DOMAIN, DOMAIN__HYPERCALL); diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index e74d98d736..89b99966bb 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -357,8 +357,6 @@ class mmu map_write # XEN_DOMCTL_getpageframeinfo3 pageinfo -# XEN_DOMCTL_getmemlist - pagelist # XENMEM_{increase,decrease}_reservation, XENMEM_populate_physmap adjust # XENMEM_{current,maximum}_reservation, XENMEM_maximum_gpfn