Skip to contentSkip to conversation

FAILED: patch "[PATCH] of: unittest: kmemleak in of_unittest_platform_populate()" failed to apply to 4.14-stable tree

PATCH [email protected] 2 participants 2 messages Apr 21, 2020 – Apr 22, 2020

Subsystems (2)
Stable branch Device tree
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 216830d2413cc61be3f76bc02ffd905e47d2439e Mon Sep 17 00:00:00 2001
From: Frank Rowand <[email protected]>
Date: Thu, 16 Apr 2020 16:42:47 -0500
Subject: [PATCH] of: unittest: kmemleak in of_unittest_platform_populate()

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. <[email protected]>
Signed-off-by Frank Rowand <[email protected]>
Signed-off-by Rob Herring <[email protected]>
drivers/of/unittest.c +5 -2
index 20ff2dfc3143..4c7818276857 100644
@@ -1247,10 +1247,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 '%pOFn'\n",
 				 grandchild);
+			of_dev_put(pdev);
+		}
 	}
 
 	of_platform_depopulate(&test_bus->dev);
maintainer
#1 lore raw
Quoted 20 lines · On Tue, Apr 21, 2020 at 07:09:37PM +0200, [email protected] wrote:

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 216830d2413cc61be3f76bc02ffd905e47d2439e Mon Sep 17 00:00:00 2001
From: Frank Rowand <[email protected]>
Date: Thu, 16 Apr 2020 16:42:47 -0500
Subject: [PATCH] of: unittest: kmemleak in of_unittest_platform_populate()

kmemleak reports several memory leaks from devicetree unittest. This is the fix for problem 2 of 5.

Quoted 8 lines

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. <[email protected]>
Signed-off-by Frank Rowand <[email protected]>
Signed-off-by Rob Herring <[email protected]>

Conflict with a613b26a5013 ("of: Convert to using %pOFn instead of device_node.name"). Fixed and queued for 4.14-4.4.

Signature · 2 lines
Thanks,
Sasha