From a65179dedd6415134029de00a17c218af647fb1a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= Date: Wed, 16 May 2018 16:28:46 +0200 Subject: [PATCH] vpci/msi: fix unbind loop MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The current unbind loop on failure in vpci_msi_enable is wrong and will only work correctly if the initial pirq is 0. Fix this by adding a proper bound. Reported-by: Jan Beulich Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-acked-by: Juergen Gross --- xen/arch/x86/hvm/vmsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 900d4f67d4..5ab7387d78 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -710,7 +710,7 @@ static int vpci_msi_enable(const struct pci_dev *pdev, uint32_t data, "%04x:%02x:%02x.%u: failed to bind PIRQ %u: %d\n", pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn), pirq + i, rc); - while ( bind.machine_irq-- ) + while ( bind.machine_irq-- > pirq ) pt_irq_destroy_bind(pdev->domain, &bind); spin_lock(&pdev->domain->event_lock); unmap_domain_pirq(pdev->domain, pirq); -- 2.30.2