Skip to content

Commit 9561475

Browse files
nicstangebjorn-helgaas
authored andcommitted
PCI: Fix race condition with driver_override
The driver_override implementation is susceptible to a race condition when different threads are reading vs. storing a different driver override. Add locking to avoid the race condition. This is in close analogy to commit 6265539 ("driver core: platform: fix race condition with driver_override") from Adrian Salido. Fixes: 782a985 ("PCI: Introduce new device binding path using pci_dev.driver_override") Signed-off-by: Nicolai Stange <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Cc: [email protected] # v3.16+
1 parent fe59493 commit 9561475

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

drivers/pci/pci-sysfs.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ static ssize_t driver_override_store(struct device *dev,
686686
const char *buf, size_t count)
687687
{
688688
struct pci_dev *pdev = to_pci_dev(dev);
689-
char *driver_override, *old = pdev->driver_override, *cp;
689+
char *driver_override, *old, *cp;
690690

691691
/* We need to keep extra room for a newline */
692692
if (count >= (PAGE_SIZE - 1))
@@ -700,12 +700,15 @@ static ssize_t driver_override_store(struct device *dev,
700700
if (cp)
701701
*cp = '\0';
702702

703+
device_lock(dev);
704+
old = pdev->driver_override;
703705
if (strlen(driver_override)) {
704706
pdev->driver_override = driver_override;
705707
} else {
706708
kfree(driver_override);
707709
pdev->driver_override = NULL;
708710
}
711+
device_unlock(dev);
709712

710713
kfree(old);
711714

@@ -716,8 +719,12 @@ static ssize_t driver_override_show(struct device *dev,
716719
struct device_attribute *attr, char *buf)
717720
{
718721
struct pci_dev *pdev = to_pci_dev(dev);
722+
ssize_t len;
719723

720-
return snprintf(buf, PAGE_SIZE, "%s\n", pdev->driver_override);
724+
device_lock(dev);
725+
len = snprintf(buf, PAGE_SIZE, "%s\n", pdev->driver_override);
726+
device_unlock(dev);
727+
return len;
721728
}
722729
static DEVICE_ATTR_RW(driver_override);
723730

0 commit comments

Comments
 (0)