Commit 3853f912 authored Nov 17, 2020 by Zhenzhong Duan Committed by Bjorn Helgaas Nov 20, 2020

PCI: Avoid duplicate IDs in driver dynamic IDs list

When a device ID is written to /sys/bus/pci/drivers/.../new_id, we
previously only checked the driver's static ID table for duplicates.
Writing the same ID several times added it to the dynamic IDs list several
times.

This doesn't cause user-visible broken behavior, but remove_id_store() only
removes one of the duplicate IDs, so if we add an ID several times, we
would have to remove it the same number of times before it's completely
gone.

Fix it by calling pci_match_device(), which checks both dynamic and static
IDs to avoid inserting duplicate IDs in dynamic IDs list.

After fix, attempts to add an ID more than once cause an error:

  # echo "1af4 1041" > /sys/bus/pci/drivers/vfio-pci/new_id
  # echo "1af4 1041" > /sys/bus/pci/drivers/vfio-pci/new_id
  bash: echo: write error: File exists

Link: https://lore.kernel.org/r/20201117054409.3428-3-zhenzhong.duan@gmail.com


Signed-off-by: Zhenzhong Duan <zhenzhong.duan@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

parent 1f40704b

drivers/pci/pci-driver.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -198,7 +198,7 @@ static ssize_t new_id_store(struct device_driver driver, const char buf,
		pdev->subsystem_device = subdevice;
		pdev->class = class;

		if (pci_match_id(pdrv->id_table, pdev))
		if (pci_match_device(pdrv, pdev))
		retval = -EEXIST;

		kfree(pdev);

Admin message