aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWen Yang <wen.yang99@zte.com.cn>2019-02-26 23:40:41 -0500
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2019-04-01 05:42:58 -0400
commit8956388d3670c5050825a6410761843ffd7e4848 (patch)
tree640da1d2beb27b2f3a2d00f2cc118d53b22293a6
parent3842f5166bf1ef286fe7a39f262b5c9581308366 (diff)
PCI: iproc: Fix a leaked reference by adding missing of_node_put()
The call to of_parse_phandle() returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage. iproc_msi_init() also calls of_node_get() to increase refcount: proc_msi_init() -> iproc_msi_alloc_domains() -> pci_msi_create_irq_domain() -> msi_create_irq_domain() -> irq_domain_create_linear() -> __irq_domain_add() so irq_domain will not be affected when it is released. Detected by coccinelle with the following warnings: ./drivers/pci/controller/pcie-iproc.c:1323:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1299, but without a corresponding object release within this function. ./drivers/pci/controller/pcie-iproc.c:1330:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1299, but without a corresponding object release within this function. Signed-off-by: Wen Yang <wen.yang99@zte.com.cn> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Ray Jui <rjui@broadcom.com> Cc: Scott Branden <sbranden@broadcom.com> Cc: bcm-kernel-feedback-list@broadcom.com Cc: linux-pci@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org
-rw-r--r--drivers/pci/controller/pcie-iproc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/pci/controller/pcie-iproc.c b/drivers/pci/controller/pcie-iproc.c
index c20fd6bd68fd..9998c5cb44c4 100644
--- a/drivers/pci/controller/pcie-iproc.c
+++ b/drivers/pci/controller/pcie-iproc.c
@@ -1320,14 +1320,18 @@ static int iproc_pcie_msi_enable(struct iproc_pcie *pcie)
1320 if (pcie->need_msi_steer) { 1320 if (pcie->need_msi_steer) {
1321 ret = iproc_pcie_msi_steer(pcie, msi_node); 1321 ret = iproc_pcie_msi_steer(pcie, msi_node);
1322 if (ret) 1322 if (ret)
1323 return ret; 1323 goto out_put_node;
1324 } 1324 }
1325 1325
1326 /* 1326 /*
1327 * If another MSI controller is being used, the call below should fail 1327 * If another MSI controller is being used, the call below should fail
1328 * but that is okay 1328 * but that is okay
1329 */ 1329 */
1330 return iproc_msi_init(pcie, msi_node); 1330 ret = iproc_msi_init(pcie, msi_node);
1331
1332out_put_node:
1333 of_node_put(msi_node);
1334 return ret;
1331} 1335}
1332 1336
1333static void iproc_pcie_msi_disable(struct iproc_pcie *pcie) 1337static void iproc_pcie_msi_disable(struct iproc_pcie *pcie)