xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

of: unittest: fix null pointer dereferencing in of_unittest_find_node_by_name()

Browse Source 
[ Upstream commit d6ce4f0ea19c32f10867ed93d8386924326ab474 ]

when kmalloc() fail to allocate memory in kasprintf(), name
or full_name will be NULL, strcmp() will cause
null pointer dereference.

Fixes: 0d638a07d3 ("of: Convert to using %pOF instead of full_name")
Signed-off-by: Ruan Jinjie <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20230727080246.519539-1-ruanjinjie@huawei.com
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ruan Jinjie
2023-07-27 16:02:46 +08:00
committed by Greg Kroah-Hartman
parent 883fdbbdbe
commit f41c65f8d0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/of/unittest.c
View File

@@ -69,7 +69,7 @@ static void __init of_unittest_find_node_by_name(void)
np = of_find_node_by_path("/testcase-data"); np = of_find_node_by_path("/testcase-data");
name = kasprintf(GFP_KERNEL, "%pOF", np); name = kasprintf(GFP_KERNEL, "%pOF", np);
unittest(np && !strcmp("/testcase-data", name), unittest(np && name && !strcmp("/testcase-data", name),
"find /testcase-data failed\n"); "find /testcase-data failed\n");
of_node_put(np); of_node_put(np);
kfree(name); kfree(name);
@@ -80,14 +80,14 @@ static void __init of_unittest_find_node_by_name(void)
np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a"); np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a");
name = kasprintf(GFP_KERNEL, "%pOF", np); name = kasprintf(GFP_KERNEL, "%pOF", np);
unittest(np && !strcmp("/testcase-data/phandle-tests/consumer-a", name), unittest(np && name && !strcmp("/testcase-data/phandle-tests/consumer-a", name),
"find /testcase-data/phandle-tests/consumer-a failed\n"); "find /testcase-data/phandle-tests/consumer-a failed\n");
of_node_put(np); of_node_put(np);
kfree(name); kfree(name);
np = of_find_node_by_path("testcase-alias"); np = of_find_node_by_path("testcase-alias");
name = kasprintf(GFP_KERNEL, "%pOF", np); name = kasprintf(GFP_KERNEL, "%pOF", np);
unittest(np && !strcmp("/testcase-data", name), unittest(np && name && !strcmp("/testcase-data", name),
"find testcase-alias failed\n"); "find testcase-alias failed\n");
of_node_put(np); of_node_put(np);
kfree(name); kfree(name);
@@ -98,7 +98,7 @@ static void __init of_unittest_find_node_by_name(void)
np = of_find_node_by_path("testcase-alias/phandle-tests/consumer-a"); np = of_find_node_by_path("testcase-alias/phandle-tests/consumer-a");
name = kasprintf(GFP_KERNEL, "%pOF", np); name = kasprintf(GFP_KERNEL, "%pOF", np);
unittest(np && !strcmp("/testcase-data/phandle-tests/consumer-a", name), unittest(np && name && !strcmp("/testcase-data/phandle-tests/consumer-a", name),
"find testcase-alias/phandle-tests/consumer-a failed\n"); "find testcase-alias/phandle-tests/consumer-a failed\n");
of_node_put(np); of_node_put(np);
kfree(name); kfree(name);
@@ -1376,6 +1376,8 @@ static void attach_node_and_children(struct device_node *np)
const char *full_name; const char *full_name;
full_name = kasprintf(GFP_KERNEL, "%pOF", np); full_name = kasprintf(GFP_KERNEL, "%pOF", np);
if (!full_name)
return;
if (!strcmp(full_name, "/__local_fixups__") || if (!strcmp(full_name, "/__local_fixups__") ||
!strcmp(full_name, "/__fixups__")) { !strcmp(full_name, "/__fixups__")) {