From: David Woodhouse <dwmw@amazon.co.uk>
Date: Tue, 24 Oct 2023 21:22:47 +0000 (+0100)
Subject: hw/xen: take iothread mutex in xen_evtchn_reset_op()
X-Git-Tag: v8.2.0-rc0~32^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=debc995e883b05c2fd02fb797a61ab1328e5bae2;p=thirdparty%2Fqemu.git

hw/xen: take iothread mutex in xen_evtchn_reset_op()

The xen_evtchn_soft_reset() function requires the iothread mutex, but is
also called for the EVTCHNOP_reset hypercall. Ensure the mutex is taken
in that case.

Cc: qemu-stable@nongnu.org
Fixes: a15b10978fe6 ("hw/xen: Implement EVTCHNOP_reset")
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---

diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index 3d6f4b4a0a2..b2b4be9983b 100644
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -1135,6 +1135,7 @@ int xen_evtchn_reset_op(struct evtchn_reset *reset)
         return -ESRCH;
     }
 
+    QEMU_IOTHREAD_LOCK_GUARD();
     return xen_evtchn_soft_reset();
 }