aboutsummaryrefslogtreecommitdiffstats
path: root/xen
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2013-10-14 09:07:02 +0200
committerJan Beulich <jbeulich@suse.com>2013-10-14 09:07:02 +0200
commitdfd1fe582367933924a1e3318ac0a0da7d2bc7e3 (patch)
treeed54c9923731af4e07273c43fb0bd896242bec4b /xen
parentef55257bc81204e34691f1c2aa9e01f2d0768bdd (diff)
downloadxen-dfd1fe582367933924a1e3318ac0a0da7d2bc7e3.tar.gz
xen-dfd1fe582367933924a1e3318ac0a0da7d2bc7e3.tar.bz2
xen-dfd1fe582367933924a1e3318ac0a0da7d2bc7e3.zip
x86/MSI: fix locking in pci_restore_msi_state()
Right after the loop the lock is being dropped, so all loop exits should happen with the lock still held. Reported-by: Kristoffer Egefelt <kristoffer@itoc.dk> Signed-off-by: Jan Beulich <jbeulich@suse.com> Tested-by: Kristoffer Egefelt <kristoffer@itoc.dk> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Diffstat (limited to 'xen')
-rw-r--r--xen/arch/x86/msi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c
index e17e5b2817..b43c36a1c6 100644
--- a/xen/arch/x86/msi.c
+++ b/xen/arch/x86/msi.c
@@ -1158,11 +1158,11 @@ int pci_restore_msi_state(struct pci_dev *pdev)
for ( i = 0; ; )
{
msi_set_mask_bit(desc, entry[i].msi_attrib.masked);
- spin_unlock_irqrestore(&desc->lock, flags);
if ( !--nr )
break;
+ spin_unlock_irqrestore(&desc->lock, flags);
desc = &irq_desc[entry[++i].irq];
spin_lock_irqsave(&desc->lock, flags);
if ( desc->msi_desc != entry + i )