PCI: of_property: Omit bus properties without a subordinate bus

Browse source

A bridge (a device with a Type 1 header) may not have a secondary bus
allocated (pdev->subordinate), e.g., if there are no available bus numbers
or the bridge secondary/subordinate bus numbers are not writable.

The dynamic OF helpers of_pci_prop_bus_range() and of_pci_prop_intr_map()
dereference pdev->subordinate without checking it.  When
CONFIG_PCI_DYNAMIC_OF_NODES is enabled, this can cause a NULL pointer
dereference and early boot hang.

Generate 'bus-range' and 'interrupt-map' properties only when a subordinate
bus exists.  Keep the node and its remaining properties for bridges without
one.

The problem was latent since 407d1a5192 ("PCI: Create device tree node
for bridge"), but wasn't reachable until 1f34072441 ("PCI: of: Create
device tree PCI host bridge node"), which appeared in v6.15.  Before
1f34072441, of_pci_make_dev_node() returned early because the parent OF
node was missing.

Fixes: 407d1a5192 ("PCI: Create device tree node for bridge")
Signed-off-by: Angel J <iamanaws@httpd.dev>
[bhelgaas: move pdev->subordinate test to callees, commit log]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org	# v6.6+
Link: https://patch.msgid.link/20260918195540.GA1187209@bhelgaas

...

This commit is contained in:

Angel J 2026-09-18 14:55:40 -05:00 • committed by Bjorn Helgaas

parent d58384c227

commit 8805840aad

1 changed files with 9 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

drivers/pci/of_property.c

View file