Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8a577ffc75d9194fe8cdb7479236f2081c26ca1f

Authored by Kay Sievers
Committed by Linus Torvalds
1 parent d91dfbb41b

driver: dont update dev_name via device_add path 

notice one system /proc/iomem some entries missed the name for pci_devices

it turns that dev->dev.kobj name is changed after device_add.

for pci code: via acpi_pci_root_driver.ops.add (aka acpi_pci_root_add)
==> pci_acpi_scan_root is used to scan pci bus/device, and at the same
time we read the resource for pci_dev in the pci_read_bases, we have
res->name = pci_name(pci_dev); pci_name is calling dev_name.

later via acpi_pci_root_driver.ops.start (aka acpi_pci_root_start) ==>
pci_bus_add_device to add all pci_dev in kobj tree.  pci_bus_add_device
will call device_add.

actually in device_add

        /* first, register with generic layer. */
        error = kobject_add(&dev->kobj, dev->kobj.parent, "%s", dev_name(dev));
        if (error)
                goto Error;

will get one new name for that kobj, old name is freed.

[Impact: fix corrupted names in /proc/iomem ]

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 5 additions and 1 deletions Side-by-side Diff

... ... @@ -891,7 +891,8 @@
891 891 set_dev_node(dev, dev_to_node(parent));
892 892  
893 893 /* first, register with generic layer. */
894   - error = kobject_add(&dev->kobj, dev->kobj.parent, "%s", dev_name(dev));
  894 + /* we require the name to be set before, and pass NULL */
  895 + error = kobject_add(&dev->kobj, dev->kobj.parent, NULL);
895 896 if (error)
896 897 goto Error;
897 898  
... ... @@ -218,6 +218,9 @@
218 218 const char *old_name = kobj->name;
219 219 char *s;
220 220  
  221 + if (kobj->name && !fmt)
  222 + return 0;
  223 +
221 224 kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
222 225 if (!kobj->name)
223 226 return -ENOMEM;