aboutsummaryrefslogtreecommitdiffstats
path: root/xen/common/compat
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2013-05-02 16:38:30 +0200
committerJan Beulich <jbeulich@suse.com>2013-05-02 16:38:30 +0200
commit99d2b149915010e986f4d8778708c5891e7b4635 (patch)
treef53f0136c9d72ceaca862d9ff9afafedd879fcb5 /xen/common/compat
parent4939f9a6dee4280f38730fd3066e5dce353112f6 (diff)
downloadxen-99d2b149915010e986f4d8778708c5891e7b4635.tar.gz
xen-99d2b149915010e986f4d8778708c5891e7b4635.tar.bz2
xen-99d2b149915010e986f4d8778708c5891e7b4635.zip
x86: make arch_set_info_guest() preemptible
.. as the root page table validation (and the dropping of an eventual old one) can require meaningful amounts of time. This is part of CVE-2013-1918 / XSA-45. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Tim Deegan <tim@xen.org>
Diffstat (limited to 'xen/common/compat')
-rw-r--r--xen/common/compat/domain.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/xen/common/compat/domain.c b/xen/common/compat/domain.c
index aac8f46eb5..44ba78ddc7 100644
--- a/xen/common/compat/domain.c
+++ b/xen/common/compat/domain.c
@@ -50,6 +50,10 @@ int compat_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg)
rc = v->is_initialised ? -EEXIST : arch_set_info_guest(v, cmp_ctxt);
domain_unlock(d);
+ if ( rc == -EAGAIN )
+ rc = hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iih",
+ cmd, vcpuid, arg);
+
xfree(cmp_ctxt);
break;
}