jsauer/torvalds-linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-11 17:10:13 +00:00
Code

of: unittest: Fix memory leak in unittest_data_add()

Browse Source 
In unittest_data_add(), if of_resolve_phandles() fails, the allocated
unittest_data is not freed, leading to a memory leak.

Fix this by using scope-based cleanup helper __free(kfree) for automatic
resource cleanup. This ensures unittest_data is automatically freed when
it goes out of scope in error paths.

For the success path, use retain_and_null_ptr() to transfer ownership
of the memory to the device tree and prevent double freeing.

Fixes: 2eb46da2a760 ("of/selftest: Use the resolver to fixup phandles")
Suggested-by: Rob Herring <robh@kernel.org>
Co-developed-by: Jianhao Xu <jianhao.xu@seu.edu.cn>
Signed-off-by: Jianhao Xu <jianhao.xu@seu.edu.cn>
Signed-off-by: Zilin Guan <zilin@seu.edu.cn>
Link: https://patch.msgid.link/20251231114915.234638-1-zilin@seu.edu.cn
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
This commit is contained in:
Zilin Guan 2025-12-31 11:49:15 +00:00 committed by Rob Herring (Arm)
parent 4f4f6b4467
commit 235a1eb8d2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/of/unittest.c
View File

@ -1985,7 +1985,6 @@ static void attach_node_and_children(struct device_node *np)
*/ */
static int __init unittest_data_add(void) static int __init unittest_data_add(void)
{ {
void *unittest_data;
void *unittest_data_align; void *unittest_data_align;
struct device_node *unittest_data_node = NULL, *np; struct device_node *unittest_data_node = NULL, *np;
/* /*
@ -2004,7 +2003,7 @@ static int __init unittest_data_add(void)
} }
/* creating copy */ /* creating copy */
unittest_data = kmalloc(size + FDT_ALIGN_SIZE, GFP_KERNEL); void *unittest_data __free(kfree) = kmalloc(size + FDT_ALIGN_SIZE, GFP_KERNEL);
if (!unittest_data) if (!unittest_data)
return -ENOMEM; return -ENOMEM;
@ -2014,12 +2013,10 @@ static int __init unittest_data_add(void)
ret = of_fdt_unflatten_tree(unittest_data_align, NULL, &unittest_data_node); ret = of_fdt_unflatten_tree(unittest_data_align, NULL, &unittest_data_node);
if (!ret) { if (!ret) {
pr_warn("%s: unflatten testcases tree failed\n", __func__); pr_warn("%s: unflatten testcases tree failed\n", __func__);
kfree(unittest_data);
return -ENODATA; return -ENODATA;
} }
if (!unittest_data_node) { if (!unittest_data_node) {
pr_warn("%s: testcases tree is empty\n", __func__); pr_warn("%s: testcases tree is empty\n", __func__);
kfree(unittest_data);
return -ENODATA; return -ENODATA;
} }
@ -2038,7 +2035,6 @@ static int __init unittest_data_add(void)
/* attach the sub-tree to live tree */ /* attach the sub-tree to live tree */
if (!of_root) { if (!of_root) {
pr_warn("%s: no live tree to attach sub-tree\n", __func__); pr_warn("%s: no live tree to attach sub-tree\n", __func__);
kfree(unittest_data);
rc = -ENODEV; rc = -ENODEV;
goto unlock; goto unlock;
} }
@ -2059,6 +2055,8 @@ static int __init unittest_data_add(void)
EXPECT_END(KERN_INFO, EXPECT_END(KERN_INFO,
"Duplicate name in testcase-data, renamed to \"duplicate-name#1\""); "Duplicate name in testcase-data, renamed to \"duplicate-name#1\"");
retain_and_null_ptr(unittest_data);
unlock: unlock:
of_overlay_mutex_unlock(); of_overlay_mutex_unlock();