summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2009-01-17 16:23:55 +0100
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-01-19 10:55:54 -0800
commitc2fdd36b550659f5ac2240d1f5a83ffa1a092289 (patch)
tree670558bb598d185fb1805f09bf5d39da13b03d91 /drivers/pci
parentaa8c6c93747f7b55fa11e1624fec8ca33763a805 (diff)
downloadop-kernel-dev-c2fdd36b550659f5ac2240d1f5a83ffa1a092289.zip
op-kernel-dev-c2fdd36b550659f5ac2240d1f5a83ffa1a092289.tar.gz
PCI hotplug: fix lock imbalance in pciehp
set_lock_status omits mutex_unlock in fail path. Add the omitted unlock. As a result a lockup caused by this can be triggered from userspace by writing 1 to /sys/bus/pci/slots/.../lock often enough. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/pciehp_core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 5482d4e..c248554 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -126,8 +126,10 @@ static int set_lock_status(struct hotplug_slot *hotplug_slot, u8 status)
mutex_lock(&slot->ctrl->crit_sect);
/* has it been >1 sec since our last toggle? */
- if ((get_seconds() - slot->last_emi_toggle) < 1)
+ if ((get_seconds() - slot->last_emi_toggle) < 1) {
+ mutex_unlock(&slot->ctrl->crit_sect);
return -EINVAL;
+ }
/* see what our current state is */
retval = get_lock_status(hotplug_slot, &value);
OpenPOWER on IntegriCloud