Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e04087b3 authored by Frank Rowand's avatar Frank Rowand Committed by Greg Kroah-Hartman
Browse files

of: unittest: kmemleak in of_unittest_overlay_high_level() 



commit 145fc138f9aae4f9e1331352e301df28e16aed35 upstream.

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

of_unittest_overlay_high_level() failed to kfree the newly created
property when the property named 'name' is skipped.

Fixes: 39a751a4 ("of: change overlay apply input data from unflattened to FDT")
Reported-by: default avatarErhard F. <erhard_f@mailbox.org>
Signed-off-by: default avatarFrank Rowand <frank.rowand@sony.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 842f7bba

drivers/of/unittest.c

+4 −1
Original line number Diff line number Diff line
@@ -2448,8 +2448,11 @@ static __init void of_unittest_overlay_high_level(void) 
				goto err_unlock;

			}

			if (__of_add_property(of_symbols, new_prop)) {

				kfree(new_prop->name);

				kfree(new_prop->value);

				kfree(new_prop);

				/* "name" auto-generated by unflatten */

				if (!strcmp(new_prop->name, "name"))

				if (!strcmp(prop->name, "name"))

					continue;

				unittest(0, "duplicate property '%s' in overlay_base node __symbols__",

					 prop->name);