summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Rowand <frank.rowand@sony.com>2020-04-16 16:42:47 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-04-24 07:59:10 +0200
commit462cd23758889d2908ff1ef1eca3cd3fd7ac9b33 (patch)
tree3f9fd2e7fcf5b46fe01000f7b33384e467fb7a27
parent462d89c078340ea3a0ffd46d2be37addadb949a1 (diff)
of: unittest: kmemleak in of_unittest_platform_populate()
[ Upstream commit 216830d2413cc61be3f76bc02ffd905e47d2439e ] kmemleak reports several memory leaks from devicetree unittest. This is the fix for problem 2 of 5. of_unittest_platform_populate() left an elevated reference count for grandchild nodes (which are platform devices). Fix the platform device reference counts so that the memory will be freed. Fixes: fb2caa50fbac ("of/selftest: add testcase for nodes with same name and address") Reported-by: Erhard F. <erhard_f@mailbox.org> Signed-off-by: Frank Rowand <frank.rowand@sony.com> Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/of/unittest.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 92530525e355..aeb6d3009ae9 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -821,10 +821,13 @@ static void __init of_unittest_platform_populate(void)
of_platform_populate(np, match, NULL, &test_bus->dev);
for_each_child_of_node(np, child) {
- for_each_child_of_node(child, grandchild)
- unittest(of_find_device_by_node(grandchild),
+ for_each_child_of_node(child, grandchild) {
+ pdev = of_find_device_by_node(grandchild);
+ unittest(pdev,
"Could not create device for node '%s'\n",
grandchild->name);
+ of_dev_put(pdev);
+ }
}
of_platform_depopulate(&test_bus->dev);