write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/of/unittest.c
..
..
@@ -69,7 +69,7 @@
69
69
 
70
70
 	np = of_find_node_by_path("/testcase-data");
71
71
 	name = kasprintf(GFP_KERNEL, "%pOF", np);
72
-	unittest(np && !strcmp("/testcase-data", name),
72
+	unittest(np && name && !strcmp("/testcase-data", name),
73
73
 		"find /testcase-data failed\n");
74
74
 	of_node_put(np);
75
75
 	kfree(name);
..
..
@@ -80,14 +80,14 @@
80
80
 
81
81
 	np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a");
82
82
 	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),
84
84
 		"find /testcase-data/phandle-tests/consumer-a failed\n");
85
85
 	of_node_put(np);
86
86
 	kfree(name);
87
87
 
88
88
 	np = of_find_node_by_path("testcase-alias");
89
89
 	name = kasprintf(GFP_KERNEL, "%pOF", np);
90
-	unittest(np && !strcmp("/testcase-data", name),
90
+	unittest(np && name && !strcmp("/testcase-data", name),
91
91
 		"find testcase-alias failed\n");
92
92
 	of_node_put(np);
93
93
 	kfree(name);
..
..
@@ -98,7 +98,7 @@
98
98
 
99
99
 	np = of_find_node_by_path("testcase-alias/phandle-tests/consumer-a");
100
100
 	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),
102
102
 		"find testcase-alias/phandle-tests/consumer-a failed\n");
103
103
 	of_node_put(np);
104
104
 	kfree(name);
..
..
@@ -1376,6 +1376,8 @@
1376
1376
 	const char *full_name;
1377
1377
 
1378
1378
 	full_name = kasprintf(GFP_KERNEL, "%pOF", np);
1379
+	if (!full_name)
1380
+		return;
1379
1381
 
1380
1382
 	if (!strcmp(full_name, "/__local_fixups__") ||
1381
1383
 	    !strcmp(full_name, "/__fixups__")) {
..
..
@@ -2065,7 +2067,7 @@
2065
2067
 	of_unittest_untrack_overlay(save_id);
2066
2068
 
2067
2069
 	/* 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) {
2069
2071
 		unittest(0, "%s with device @\"%s\" %s\n",
2070
2072
 				overlay_name_from_nr(overlay_nr),
2071
2073
 				unittest_path(unittest_nr, ovtype),