x86: fix emuirq regression from XSA-21 fix

The XSA-21 patch broke the assumption of "ret" being zero prior to the
IRQ_UNBOUND check.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c
index bf1ff16144221818a5d1b903ad53186401b50746..92d3a80343d6030794d31be80001b639127b1229 100644 (file)
--- a/xen/arch/x86/physdev.c
+++ b/xen/arch/x86/physdev.c
@@ -243,6 +243,8 @@ static int physdev_unmap_pirq(struct physdev_unmap_pirq *unmap)
         spin_lock(&d->event_lock);
         if ( domain_pirq_to_emuirq(d, unmap->pirq) != IRQ_UNBOUND )
             ret = unmap_domain_pirq_emuirq(d, unmap->pirq);
+        else
+            ret = 0;
         spin_unlock(&d->event_lock);
         if ( unmap->domid == DOMID_SELF || ret )
             goto free_domain;