Skip to contentSkip to conversation

PCI: mediatek-gen3: Fix refcount leak in mtk_pcie_init_irq_domains

PATCH Applied Miaoqian Lin 4 participants 5 messages Jun 1, 2022 – Jun 9, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 PCI: mediatek-gen3: Fix refcount leak in mtk_pcie_init_irq_domains

of_get_child_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak.

Fixes 814cceebba9b ("PCI: mediatek-gen3: Add INTx support")

---
changes in v2:
- move of_node_put(intc_node) right after irq_domain_add_linear to cover normal path and error paths.
---
changes in v3:
- call of_node_put() in error paths with goto, and call of_node_put() before return 0 in normal path. Since this function has a goto part to handle resources, so put them together, as suggested by Miles Chen <[email protected]>

v1 link: https://lore.kernel.org/all/[email protected]/
v2 link: https://lore.kernel.org/all/[email protected]/

---
 drivers/pci/controller/pcie-mediatek-gen3.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/controller/pcie-mediatek-gen3.c +5 -2
index 3e8d70bfabc6..bceed28446ed 100644
@@ -600,7 +600,8 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pcie *pcie)
 						  &intx_domain_ops, pcie);
 	if (!pcie->intx_domain) {
 		dev_err(dev, "failed to create INTx IRQ domain\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto out_put_node;
 	}
 
 	/* Setup MSI */
@@ -623,13 +624,15 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pcie *pcie)
 		goto err_msi_domain;
 	}
 
+	of_node_put(intc_node);
 	return 0;
 
 err_msi_domain:
 	irq_domain_remove(pcie->msi_bottom_domain);
 err_msi_bottom_domain:
 	irq_domain_remove(pcie->intx_domain);
-
+out_put_node:
+	of_node_put(intc_node);
 	return ret;
 }
 
Signature · 1 line
2.25.1
Reviewed-by on v3 1/1
#1 lore raw

Hi Miaoqian,

Quoted 6 lines

of_get_child_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak.

Fixes 814cceebba9b ("PCI: mediatek-gen3: Add INTx support")

Thanks for scanning the refcont leak and submitting this!

Quoted 12 lines

---
changes in v2:
- move of_node_put(intc_node) right after irq_domain_add_linear to cover normal path and error paths.
---
changes in v3:
- call of_node_put() in error paths with goto, and call of_node_put() before return 0 in normal path. Since this function has a goto part to handle resources, so put them together, as suggested by Miles Chen <[email protected]>

v1 link: https://lore.kernel.org/all/[email protected]/
v2 link: https://lore.kernel.org/all/[email protected]/

#2 lore raw
In reply to Miaoqian Lin
Quoted 6 lines · Miaoqian Lin

of_get_child_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak.

Fixes 814cceebba9b ("PCI: mediatek-gen3: Add INTx support")

Can we get an ack from Ryder or Jianjun, as well, since they're listed as maintainers?

Quoted 55 lines

---
changes in v2:
- move of_node_put(intc_node) right after irq_domain_add_linear to cover normal path and error paths.
---
changes in v3:
- call of_node_put() in error paths with goto, and call of_node_put() before return 0 in normal path. Since this function has a goto part to handle resources, so put them together, as suggested by Miles Chen <[email protected]>

v1 link: https://lore.kernel.org/all/[email protected]/
v2 link: https://lore.kernel.org/all/[email protected]/

---
 drivers/pci/controller/pcie-mediatek-gen3.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/controller/pcie-mediatek-gen3.c +5 -2
index 3e8d70bfabc6..bceed28446ed 100644
@@ -600,7 +600,8 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pcie *pcie)
 						  &intx_domain_ops, pcie);
 	if (!pcie->intx_domain) {
 		dev_err(dev, "failed to create INTx IRQ domain\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto out_put_node;
 	}
 
 	/* Setup MSI */
@@ -623,13 +624,15 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pcie *pcie)
 		goto err_msi_domain;
 	}
 
+	of_node_put(intc_node);
 	return 0;
 
 err_msi_domain:
 	irq_domain_remove(pcie->msi_bottom_domain);
 err_msi_bottom_domain:
 	irq_domain_remove(pcie->intx_domain);
-
+out_put_node:
+	of_node_put(intc_node);
 	return ret;
 }
 
Signature · 7 lines
2.25.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Acked-by
#3 lore raw

Hi Bjorn,

Quoted 6 lines · Bjorn Helgaas
Quoted 5 lines · Miaoqian Lin

of_get_child_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore.
Add missing of_node_put() to avoid refcount leak.

Quoted 6 lines
Quoted 2 lines
Fixes 814cceebba9b ("PCI: mediatek-gen3: Add INTx support")

Can we get an ack from Ryder or Jianjun, as well, since they're listed
as maintainers?

Sure, thanks for the reminder.

Quoted 66 lines
Quoted 66 lines

---
changes in v2:
- move of_node_put(intc_node) right after irq_domain_add_linear to cover
normal path and error paths.
---
changes in v3:
- call of_node_put() in error paths with goto, and call of_node_put() before
return 0 in normal path. Since this function has a goto part to
handle
resources, so put them together, as suggested by Miles Chen <
[email protected]>

v1 link:
https://lore.kernel.org/all/[email protected]/
v2 link:
https://lore.kernel.org/all/[email protected]/

---
 drivers/pci/controller/pcie-mediatek-gen3.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/controller/pcie-mediatek-gen3.c +2 -1
index 3e8d70bfabc6..bceed28446ed 100644
@@ -600,7 +600,8 @@ static int mtk_pcie_init_irq_domains(struct
 mtk_gen3_pcie *pcie)
 						  &intx_domain_ops,
 pcie);
 	if (!pcie->intx_domain) {
 		dev_err(dev, "failed to create INTx IRQ domain\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto out_put_node;
 	}
drivers/pci/controller/pcie-mediatek-gen3.c +3 -1
 	/* Setup MSI */
@@ -623,13 +624,15 @@ static int mtk_pcie_init_irq_domains(struct
 mtk_gen3_pcie *pcie)
 		goto err_msi_domain;
 	}
 
+	of_node_put(intc_node);
 	return 0;
 
 err_msi_domain:
 	irq_domain_remove(pcie->msi_bottom_domain);
 err_msi_bottom_domain:
 	irq_domain_remove(pcie->intx_domain);
-
+out_put_node:
+	of_node_put(intc_node);
 	return ret;
 }
Signature · 8 lines
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#4 lore raw
In reply to Miaoqian Lin
Quoted 6 lines · Miaoqian Lin

of_get_child_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak.

Fixes 814cceebba9b ("PCI: mediatek-gen3: Add INTx support")

Applied to pci/ctrl/mediatek-gen3 with Miles' reviewed-by and Jianjun's ack, thanks!

Quoted 55 lines

---
changes in v2:
- move of_node_put(intc_node) right after irq_domain_add_linear to cover normal path and error paths.
---
changes in v3:
- call of_node_put() in error paths with goto, and call of_node_put() before return 0 in normal path. Since this function has a goto part to handle resources, so put them together, as suggested by Miles Chen <[email protected]>

v1 link: https://lore.kernel.org/all/[email protected]/
v2 link: https://lore.kernel.org/all/[email protected]/

---
 drivers/pci/controller/pcie-mediatek-gen3.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/controller/pcie-mediatek-gen3.c +5 -2
index 3e8d70bfabc6..bceed28446ed 100644
@@ -600,7 +600,8 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pcie *pcie)
 						  &intx_domain_ops, pcie);
 	if (!pcie->intx_domain) {
 		dev_err(dev, "failed to create INTx IRQ domain\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto out_put_node;
 	}
 
 	/* Setup MSI */
@@ -623,13 +624,15 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pcie *pcie)
 		goto err_msi_domain;
 	}
 
+	of_node_put(intc_node);
 	return 0;
 
 err_msi_domain:
 	irq_domain_remove(pcie->msi_bottom_domain);
 err_msi_bottom_domain:
 	irq_domain_remove(pcie->intx_domain);
-
+out_put_node:
+	of_node_put(intc_node);
 	return ret;
 }
 
Signature · 7 lines
2.25.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel