]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
of: unittest: fix memory leak in attach_node_and_children
authorErhard Furtner <erhard_f@mailbox.org>
Tue, 26 Nov 2019 01:48:04 +0000 (02:48 +0100)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 29 Jan 2020 05:05:10 +0000 (00:05 -0500)
BugLink: https://bugs.launchpad.net/bugs/1860816
[ Upstream commit 2aacace6dbbb6b6ce4e177e6c7ea901f389c0472 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/of/unittest.c

index 8b7bd48224657655fe4e0fd07e3cd3c8964a11a2..29172cc67d624cb4a1261da89530d10178d0b55d 100644 (file)
@@ -1144,8 +1144,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);