Re: [PATCH] PCI: of_property: Omit 'bus-range' property if no secondary bus

From: Manivannan Sadhasivam

Date: Wed Apr 29 2026 - 11:45:04 EST


On Tue, Feb 24, 2026 at 02:21:03PM +0800, Bo Sun wrote:
> The previous implementation of of_pci_add_properties() and
> of_pci_prop_bus_range() assumed that a valid secondary bus is always
> present, which can be problematic in cases where no bus numbers are
> assigned for a secondary bus. This patch introduces a check for a valid

Imperative tone, please.

> secondary bus and omits the 'bus-range' property if it is not available,
> preventing dereferencing the NULL pointer.
>
> Cc: stable@xxxxxxxxxxxxxxx
> Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
> Suggested-by: Bjorn Helgaas <helgaas@xxxxxxxxxx>
> Signed-off-by: Bo Sun <bo.sun.cn@xxxxxxxxxxxxx>
> ---
> drivers/pci/of_property.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c
> index 75a358f73e69..cade01ea6e68 100644
> --- a/drivers/pci/of_property.c
> +++ b/drivers/pci/of_property.c
> @@ -95,6 +95,9 @@ static int of_pci_prop_bus_range(struct pci_dev *pdev,
> struct of_changeset *ocs,
> struct device_node *np)
> {
> + if (!pdev->subordinate)
> + return -EINVAL;

Returning errno is not 'omitting'. This will result in a failure of
of_pci_add_properties(). I hope that's not what you wanted.

- Mani

--
மணிவண்ணன் சதாசிவம்