Skip to content
/ linux Public

Commit bd435f4

Browse files
guojinhui-liamSasha Levin
authored andcommitted
PCI: Fix pci_slot_trylock() error handling
[ Upstream commit 9368d1e ] Commit a4e7728 ("PCI: Add missing bridge lock to pci_bus_lock()") delegates the bridge device's pci_dev_trylock() to pci_bus_trylock() in pci_slot_trylock(), but it forgets to remove the corresponding pci_dev_unlock() when pci_bus_trylock() fails. Before a4e7728, the code did: if (!pci_dev_trylock(dev)) /* <- lock bridge device */ goto unlock; if (dev->subordinate) { if (!pci_bus_trylock(dev->subordinate)) { pci_dev_unlock(dev); /* <- unlock bridge device */ goto unlock; } } After a4e7728 the bridge-device lock is no longer taken, but the pci_dev_unlock(dev) on the failure path was left in place, leading to the bug. This yields one of two errors: 1. A warning that the lock is being unlocked when no one holds it. 2. An incorrect unlock of a lock that belongs to another thread. Fix it by removing the now-redundant pci_dev_unlock(dev) on the failure path. [Same patch later posted by Keith at https://patch.msgid.link/20260116184150.3013258-1-kbusch@meta.com] Fixes: a4e7728 ("PCI: Add missing bridge lock to pci_bus_lock()") Signed-off-by: Jinhui Guo <guojinhui.liam@bytedance.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Dan Williams <dan.j.williams@intel.com> Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20251212145528.2555-1-guojinhui.liam@bytedance.com Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 627f0ea commit bd435f4

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/pci/pci.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5500,10 +5500,8 @@ static int pci_slot_trylock(struct pci_slot *slot)
55005500
if (!dev->slot || dev->slot != slot)
55015501
continue;
55025502
if (dev->subordinate) {
5503-
if (!pci_bus_trylock(dev->subordinate)) {
5504-
pci_dev_unlock(dev);
5503+
if (!pci_bus_trylock(dev->subordinate))
55055504
goto unlock;
5506-
}
55075505
} else if (!pci_dev_trylock(dev))
55085506
goto unlock;
55095507
}

0 commit comments

Comments
 (0)