| Message ID | 20250324090108.965229-3-Bo.Sun.CN@windriver.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI: Marvell CN96XX/CN10XXX quirk and bus-range omission | expand |
On Mon, Mar 24, 2025 at 05:01:08PM +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 > secondary bus and omits the 'bus-range' property if it is not available, > preventing dereferencing the NULL pointer. > > Cc: stable@vger.kernel.org > Fixes: 407d1a51921e ("PCI: Create device tree node for bridge") > Suggested-by: Bjorn Helgaas <helgaas@kernel.org> > Signed-off-by: Bo Sun <Bo.Sun.CN@windriver.com> Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > --- > v3: Add 'Fixes' tag as requested by Mani. > > 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 58fbafac7c6a..792b0163af45 100644 > --- a/drivers/pci/of_property.c > +++ b/drivers/pci/of_property.c > @@ -91,6 +91,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; > + > u32 bus_range[] = { pdev->subordinate->busn_res.start, > pdev->subordinate->busn_res.end }; > > -- > 2.49.0 >
diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c index 58fbafac7c6a..792b0163af45 100644 --- a/drivers/pci/of_property.c +++ b/drivers/pci/of_property.c @@ -91,6 +91,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; + u32 bus_range[] = { pdev->subordinate->busn_res.start, pdev->subordinate->busn_res.end };
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 secondary bus and omits the 'bus-range' property if it is not available, preventing dereferencing the NULL pointer. Cc: stable@vger.kernel.org Fixes: 407d1a51921e ("PCI: Create device tree node for bridge") Suggested-by: Bjorn Helgaas <helgaas@kernel.org> Signed-off-by: Bo Sun <Bo.Sun.CN@windriver.com> --- v3: Add 'Fixes' tag as requested by Mani. drivers/pci/of_property.c | 3 +++ 1 file changed, 3 insertions(+)