Merge branch 'pci/controller/kirin'

bjorn-helgaas · bjorn-helgaas · commit af6491944072 · 2024-09-19T14:25:31.000-05:00
- Fix potential buffer overflow in kirin_pcie_parse_port() (Alexandra
  Diupina)

* pci/controller/kirin:
  PCI: kirin: Fix buffer overflow in kirin_pcie_parse_port()
diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c
@@ -420,11 +420,11 @@ static int kirin_pcie_parse_port(struct kirin_pcie *pcie,
 						     "unable to get a valid reset gpio\n");
 			}
 
-			pcie->num_slots++;
-			if (pcie->num_slots > MAX_PCI_SLOTS) {
+			if (pcie->num_slots + 1 >= MAX_PCI_SLOTS) {
 				dev_err(dev, "Too many PCI slots!\n");
 				return -EINVAL;
 			}
+			pcie->num_slots++;
 
 			ret = of_pci_get_devfn(child);
 			if (ret < 0) {

Original file line number	Diff line number	Diff line change
`@@ -420,11 +420,11 @@ static int kirin_pcie_parse_port(struct kirin_pcie *pcie,`
`420`	`420`	`"unable to get a valid reset gpio\n");`
`421`	`421`	`}`
`422`	`422`
`423`		`- pcie->num_slots++;`
`424`		`- if (pcie->num_slots > MAX_PCI_SLOTS) {`
	`423`	`+ if (pcie->num_slots + 1 >= MAX_PCI_SLOTS) {`
`425`	`424`	`dev_err(dev, "Too many PCI slots!\n");`
`426`	`425`	`return -EINVAL;`
`427`	`426`	`}`
	`427`	`+ pcie->num_slots++;`
`428`	`428`
`429`	`429`	`ret = of_pci_get_devfn(child);`
`430`	`430`	`if (ret < 0) {`