| From b22d9e3324951f362333c91473cd29b880362c49 Mon Sep 17 00:00:00 2001 |
| From: Erhard Furtner <erhard_f@mailbox.org> |
| Date: Tue, 26 Nov 2019 02:48:04 +0100 |
| Subject: [PATCH] of: unittest: fix memory leak in attach_node_and_children |
| |
| commit 2aacace6dbbb6b6ce4e177e6c7ea901f389c0472 upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c |
| index 55bcac00f33d..4c019e264e21 100644 |
| --- a/drivers/of/unittest.c |
| +++ b/drivers/of/unittest.c |
| @@ -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); |
| -- |
| 2.7.4 |
| |
