hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/drivers/of/unittest.c
....@@ -69,7 +69,7 @@
6969
7070 np = of_find_node_by_path("/testcase-data");
7171 name = kasprintf(GFP_KERNEL, "%pOF", np);
72
- unittest(np && !strcmp("/testcase-data", name),
72
+ unittest(np && name && !strcmp("/testcase-data", name),
7373 "find /testcase-data failed\n");
7474 of_node_put(np);
7575 kfree(name);
....@@ -80,14 +80,14 @@
8080
8181 np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a");
8282 name = kasprintf(GFP_KERNEL, "%pOF", np);
83
- unittest(np && !strcmp("/testcase-data/phandle-tests/consumer-a", name),
83
+ unittest(np && name && !strcmp("/testcase-data/phandle-tests/consumer-a", name),
8484 "find /testcase-data/phandle-tests/consumer-a failed\n");
8585 of_node_put(np);
8686 kfree(name);
8787
8888 np = of_find_node_by_path("testcase-alias");
8989 name = kasprintf(GFP_KERNEL, "%pOF", np);
90
- unittest(np && !strcmp("/testcase-data", name),
90
+ unittest(np && name && !strcmp("/testcase-data", name),
9191 "find testcase-alias failed\n");
9292 of_node_put(np);
9393 kfree(name);
....@@ -98,7 +98,7 @@
9898
9999 np = of_find_node_by_path("testcase-alias/phandle-tests/consumer-a");
100100 name = kasprintf(GFP_KERNEL, "%pOF", np);
101
- unittest(np && !strcmp("/testcase-data/phandle-tests/consumer-a", name),
101
+ unittest(np && name && !strcmp("/testcase-data/phandle-tests/consumer-a", name),
102102 "find testcase-alias/phandle-tests/consumer-a failed\n");
103103 of_node_put(np);
104104 kfree(name);
....@@ -1376,6 +1376,8 @@
13761376 const char *full_name;
13771377
13781378 full_name = kasprintf(GFP_KERNEL, "%pOF", np);
1379
+ if (!full_name)
1380
+ return;
13791381
13801382 if (!strcmp(full_name, "/__local_fixups__") ||
13811383 !strcmp(full_name, "/__fixups__")) {
....@@ -2065,7 +2067,7 @@
20652067 of_unittest_untrack_overlay(save_id);
20662068
20672069 /* unittest device must be again in before state */
2068
- if (of_unittest_device_exists(unittest_nr, PDEV_OVERLAY) != before) {
2070
+ if (of_unittest_device_exists(unittest_nr, ovtype) != before) {
20692071 unittest(0, "%s with device @\"%s\" %s\n",
20702072 overlay_name_from_nr(overlay_nr),
20712073 unittest_path(unittest_nr, ovtype),