diff options
| author | Andres Lagar-Cavilla <andres@lagarcavilla.org> | 2012-02-16 15:43:02 +0000 |
|---|---|---|
| committer | Andres Lagar-Cavilla <andres@lagarcavilla.org> | 2012-02-16 15:43:02 +0000 |
| commit | 5167dea268bb2e9174e18e9c1ff01de18a2b6ec6 (patch) | |
| tree | a8c93a4cf5ad6e0ca505ed6b70cf58ef30afff04 | |
| parent | 64f9219d68f5c28af469bce8ec27cfaef07b9011 (diff) | |
| download | xen-5167dea268bb2e9174e18e9c1ff01de18a2b6ec6.tar.gz xen-5167dea268bb2e9174e18e9c1ff01de18a2b6ec6.tar.bz2 xen-5167dea268bb2e9174e18e9c1ff01de18a2b6ec6.zip | |
x86/mm: Check sharing/paging/access have been enabled before processing a memop
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
Acked-by: Tim Deegan <tim@xen.org>
Committed-by: Tim Deegan <tim@xen.org>
| -rw-r--r-- | xen/arch/x86/mm/mem_access.c | 3 | ||||
| -rw-r--r-- | xen/arch/x86/mm/mem_event.c | 6 | ||||
| -rw-r--r-- | xen/arch/x86/mm/mem_paging.c | 3 | ||||
| -rw-r--r-- | xen/arch/x86/mm/mem_sharing.c | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/xen/arch/x86/mm/mem_access.c b/xen/arch/x86/mm/mem_access.c index 94a4c30f04..a08416c40e 100644 --- a/xen/arch/x86/mm/mem_access.c +++ b/xen/arch/x86/mm/mem_access.c @@ -29,6 +29,9 @@ int mem_access_memop(struct domain *d, xen_mem_event_op_t *meo) { int rc; + if ( unlikely(!d->mem_event->access.ring_page) ) + return -ENODEV; + switch( meo->op ) { case XENMEM_access_op_resume: diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c index 138fcdfdf6..3b2267adfb 100644 --- a/xen/arch/x86/mm/mem_event.c +++ b/xen/arch/x86/mm/mem_event.c @@ -452,13 +452,15 @@ int mem_event_claim_slot(struct domain *d, struct mem_event_domain *med) /* Registered with Xen-bound event channel for incoming notifications. */ static void mem_paging_notification(struct vcpu *v, unsigned int port) { - p2m_mem_paging_resume(v->domain); + if ( likely(v->domain->mem_event->paging.ring_page != NULL) ) + p2m_mem_paging_resume(v->domain); } /* Registered with Xen-bound event channel for incoming notifications. */ static void mem_access_notification(struct vcpu *v, unsigned int port) { - p2m_mem_access_resume(v->domain); + if ( likely(v->domain->mem_event->access.ring_page != NULL) ) + p2m_mem_access_resume(v->domain); } struct domain *get_mem_event_op_target(uint32_t domain, int *rc) diff --git a/xen/arch/x86/mm/mem_paging.c b/xen/arch/x86/mm/mem_paging.c index 4fdf3d74b8..6cf9b385b0 100644 --- a/xen/arch/x86/mm/mem_paging.c +++ b/xen/arch/x86/mm/mem_paging.c @@ -27,6 +27,9 @@ int mem_paging_memop(struct domain *d, xen_mem_event_op_t *mec) { + if ( unlikely(!d->mem_event->paging.ring_page) ) + return -ENODEV; + switch( mec->op ) { case XENMEM_paging_op_nominate: diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 36a50e58d4..b73d48827f 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1022,7 +1022,7 @@ int mem_sharing_memop(struct domain *d, xen_mem_sharing_op_t *mec) int rc = 0; /* Only HAP is supported */ - if ( !hap_enabled(d) ) + if ( !hap_enabled(d) || !d->arch.hvm_domain.mem_sharing_enabled ) return -ENODEV; switch(mec->op) |