From: Wen Yang <wen.yang99@zte.com.cn>
To: benh@kernel.crashing.org
Cc: paulus@samba.org, mpe@ellerman.id.au, tyreld@linux.vnet.ibm.com,
bhelgaas@google.com, linuxppc-dev@lists.ozlabs.org,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
ryder.lee@mediatek.com, lorenzo.pieralisi@arm.com,
matthias.bgg@gmail.com, linux-mediatek@lists.infradead.org,
linux-arm-kernel@lists.infradead.org, rjui@broadcom.com,
sbranden@broadcom.com, bcm-kernel-feedback-list@broadcom.com,
thomas.petazzoni@bootlin.com, shawn.lin@rock-chips.com,
heiko@sntech.de, linux-rockchip@lists.infradead.org,
minghuan.Lian@nxp.com, mingkai.hu@nxp.com, roy.zang@nxp.com,
hayashi.kunihiko@socionext.com, yamada.masahiro@socionext.com,
kishon@ti.com, linux-omap@vger.kernel.org, wang.yi59@zte.com.cn,
Wen Yang <wen.yang99@zte.com.cn>
Subject: [PATCH 5/8] PCI: aardvark: fix a leaked reference by adding missing of_node_put
Date: Wed, 27 Feb 2019 12:40:40 +0800 [thread overview]
Message-ID: <1551242443-27300-5-git-send-email-wen.yang99@zte.com.cn> (raw)
In-Reply-To: <1551242443-27300-1-git-send-email-wen.yang99@zte.com.cn>
The call to of_get_next_child returns a node pointer with refcount
incremented thus it must be explicitly decremented after the last
usage.
irq_domain_add_linear also calls of_node_get to increase refcount,
so irq_domain will not be affected when it is released.
Detected by coccinelle with the following warnings:
./drivers/pci/controller/pci-aardvark.c:826:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 798, but without a corresponding object release within this function.
Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
drivers/pci/controller/pci-aardvark.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 750081c..56ecb16 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -794,6 +794,7 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie)
struct device_node *node = dev->of_node;
struct device_node *pcie_intc_node;
struct irq_chip *irq_chip;
+ int ret = 0;
pcie_intc_node = of_get_next_child(node, NULL);
if (!pcie_intc_node) {
@@ -806,8 +807,8 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie)
irq_chip->name = devm_kasprintf(dev, GFP_KERNEL, "%s-irq",
dev_name(dev));
if (!irq_chip->name) {
- of_node_put(pcie_intc_node);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto out_put_node;
}
irq_chip->irq_mask = advk_pcie_irq_mask;
@@ -819,11 +820,13 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie)
&advk_pcie_irq_domain_ops, pcie);
if (!pcie->irq_domain) {
dev_err(dev, "Failed to get a INTx IRQ domain\n");
- of_node_put(pcie_intc_node);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto out_put_node;
}
- return 0;
+out_put_node:
+ of_node_put(pcie_intc_node);
+ return ret;
}
static void advk_pcie_remove_irq_domain(struct advk_pcie *pcie)
--
2.9.5
next prev parent reply other threads:[~2019-02-27 4:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-27 4:40 [PATCH 1/8] PCI: dwc: pci-dra7xx: fix a leaked reference by adding missing of_node_put Wen Yang
2019-02-27 4:40 ` [PATCH 2/8] PCI: uniphier: " Wen Yang
2019-02-27 4:40 ` [PATCH 3/8] PCI: dwc: layerscape: " Wen Yang
2019-02-27 4:40 ` [PATCH 4/8] PCI: rockchip: " Wen Yang
2019-02-27 4:40 ` Wen Yang [this message]
2019-02-27 4:40 ` [PATCH 6/8] PCI: iproc: " Wen Yang
2019-02-27 4:40 ` [PATCH 7/8] PCI: mediatek: " Wen Yang
2019-03-01 1:59 ` Honghui Zhang
2019-02-27 4:40 ` [PATCH 8/8] PCI: rpadlpar: " Wen Yang
2019-04-01 10:03 ` [PATCH 1/8] PCI: dwc: pci-dra7xx: " Lorenzo Pieralisi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1551242443-27300-5-git-send-email-wen.yang99@zte.com.cn \
--to=wen.yang99@zte.com.cn \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=hayashi.kunihiko@socionext.com \
--cc=heiko@sntech.de \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=minghuan.Lian@nxp.com \
--cc=mingkai.hu@nxp.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=rjui@broadcom.com \
--cc=roy.zang@nxp.com \
--cc=ryder.lee@mediatek.com \
--cc=sbranden@broadcom.com \
--cc=shawn.lin@rock-chips.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=tyreld@linux.vnet.ibm.com \
--cc=wang.yi59@zte.com.cn \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).