summary refs log tree commit diff
path: root/drivers/of/unittest.c
diff options
context:
space:
mode:
authorErhard Furtner <erhard_f@mailbox.org>2019-11-26 02:48:04 +0100
committerRob Herring <robh@kernel.org>2019-11-26 12:32:43 -0700
commit2aacace6dbbb6b6ce4e177e6c7ea901f389c0472 (patch)
treead46497560cf29bd98698b72d1234e4074ac2a14 /drivers/of/unittest.c
parent637392a8506a3a7dd24ab9094a14f7522adb73b4 (diff)
downloadlinux-2aacace6dbbb6b6ce4e177e6c7ea901f389c0472.tar.gz
of: unittest: fix memory leak in attach_node_and_children
In attach_node_and_children memory is allocated for full_name via
kasprintf. If the condition of the 1st if is not met the function
returns early without freeing the memory. Add a kfree() to fix that.

This has been detected with kmemleak:
Link: https://bugzilla.kernel.org/show_bug.cgi?id=205327

It looks like the leak was introduced by this commit:
Fixes: 5babefb7f7ab ("of: unittest: allow base devicetree to have symbol metadata")

Signed-off-by: Erhard Furtner <erhard_f@mailbox.org>
Reviewed-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Tyrel Datwyler <tyreld@linux.ibm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of/unittest.c')
-rw-r--r--drivers/of/unittest.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 445f134b62c0..68b87587b2ef 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -1236,8 +1236,10 @@ static void attach_node_and_children(struct device_node *np)
 	full_name = kasprintf(GFP_KERNEL, "%pOF", np);
 
 	if (!strcmp(full_name, "/__local_fixups__") ||
-	    !strcmp(full_name, "/__fixups__"))
+	    !strcmp(full_name, "/__fixups__")) {
+		kfree(full_name);
 		return;
+	}
 
 	dup = of_find_node_by_path(full_name);
 	kfree(full_name);