]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
of: dynamic: Fix memleak when of_pci_add_properties() failed
authorLizhi Hou <lizhi.hou@amd.com>
Mon, 18 Aug 2025 15:22:21 +0000 (08:22 -0700)
committerRob Herring (Arm) <robh@kernel.org>
Wed, 20 Aug 2025 23:37:51 +0000 (18:37 -0500)
When of_pci_add_properties() failed, of_changeset_destroy() is called to
free the changeset. And of_changeset_destroy() puts device tree node in
each entry but does not free property in the entry. This leads to memory
leak in the failure case.

In of_changeset_add_prop_helper(), add the property to the device tree node
deadprops list. Thus, the property will also be freed along with device
tree node.

Fixes: b544fc2b8606 ("of: dynamic: Add interfaces for creating device node dynamically")
Reported-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Closes: https://lore.kernel.org/all/aJms+YT8TnpzpCY8@lpieralisi/
Tested-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
Link: https://lore.kernel.org/r/20250818152221.3685724-1-lizhi.hou@amd.com
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
drivers/of/dynamic.c

index 0aba760f7577ef604183e37139168c2520d0787f..dd30b7d8b5e46920bf5284e08bda9c49e98bd2b0 100644 (file)
@@ -938,6 +938,9 @@ static int of_changeset_add_prop_helper(struct of_changeset *ocs,
        if (ret)
                __of_prop_free(new_pp);
 
+       new_pp->next = np->deadprops;
+       np->deadprops = new_pp;
+
        return ret;
 }