summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWen Yang <wen.yang99@zte.com.cn>2019-03-01 16:56:52 +0800
committerLinus Walleij <linus.walleij@linaro.org>2019-05-20 16:49:14 +0200
commit72187c626eeddbe9dd02bc7b8ea684a8f028c128 (patch)
tree3c65fe96930aee9899eaf82303f767dddc988b31
parenta188339ca5a396acc588e5851ed7e19f66b0ebd9 (diff)
downloadlinux-72187c626eeddbe9dd02bc7b8ea684a8f028c128.tar.gz
linux-72187c626eeddbe9dd02bc7b8ea684a8f028c128.tar.bz2
linux-72187c626eeddbe9dd02bc7b8ea684a8f028c128.zip
ARM: versatile: fix a leaked reference by addingmissing of_node_put
The call to of_get_next_child returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage. Detected by coccinelle with the following warnings: ./arch/arm/mach-versatile/versatile_dt.c:315:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 302, but without a corresponding object release within this function. ./arch/arm/mach-versatile/versatile_dt.c:320:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 302, but without a corresponding object release within this function. Signed-off-by: Wen Yang <wen.yang99@zte.com.cn> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Russell King <linux@armlinux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-versatile/versatile_dt.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c
index e9d60687e416..028463af726d 100644
--- a/arch/arm/mach-versatile/versatile_dt.c
+++ b/arch/arm/mach-versatile/versatile_dt.c
@@ -312,12 +312,12 @@ static void __init versatile_dt_pci_init(void)
* driver had it so we will keep it.
*/
writel(1, versatile_sys_base + VERSATILE_SYS_PCICTL_OFFSET);
- return;
+ goto out_put_node;
}
newprop = kzalloc(sizeof(*newprop), GFP_KERNEL);
if (!newprop)
- return;
+ goto out_put_node;
newprop->name = kstrdup("status", GFP_KERNEL);
newprop->value = kstrdup("disabled", GFP_KERNEL);
@@ -325,6 +325,9 @@ static void __init versatile_dt_pci_init(void)
of_update_property(np, newprop);
pr_info("Not plugged into PCI backplane!\n");
+
+out_put_node:
+ of_node_put(np);
}
static void __init versatile_dt_init(void)