[Xen-changelog] [xen stable-4.1] x86: fix emuirq regression from XSA-21 fix

[patchbot@xxxxxxx]

commit a04ad70f7598336e08119f47a9b478e7adc5d529
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Jun 27 13:52:55 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Jun 27 13:52:55 2013 +0200

    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@xxxxxxxx>
    Reviewed-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 xen/arch/x86/physdev.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c
index bf1ff16..92d3a80 100644
--- 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;
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.1

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog