Browse Source

vt6655: Fix a possible sleep-in-atomic bug in vt6655_suspend

The driver may sleep under a spinlock, and the function call path is:
vt6655_suspend (acquire the spinlock)
  pci_set_power_state
    __pci_start_power_transition (drivers/pci/pci.c)
      msleep --> may sleep

To fix it, pci_set_power_state is called without having a spinlock.

This bug is found by my static analysis tool and my code review.

Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jia-Ju Bai 8 years ago
parent
commit
42c8eb3f6e
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/staging/vt6655/device_main.c

+ 2 - 1
drivers/staging/vt6655/device_main.c

@@ -1693,10 +1693,11 @@ static int vt6655_suspend(struct pci_dev *pcid, pm_message_t state)
 	MACbShutdown(priv);
 	MACbShutdown(priv);
 
 
 	pci_disable_device(pcid);
 	pci_disable_device(pcid);
-	pci_set_power_state(pcid, pci_choose_state(pcid, state));
 
 
 	spin_unlock_irqrestore(&priv->lock, flags);
 	spin_unlock_irqrestore(&priv->lock, flags);
 
 
+	pci_set_power_state(pcid, pci_choose_state(pcid, state));
+
 	return 0;
 	return 0;
 }
 }