Skip to content

Commit fb52c87

Browse files
torvaldstorvalds
committed
Merge tag 'linux-kselftest-kunit-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kunit fixes from Shuah Khan: "Fixes to possible memory leak, null-ptr-deref, wild-memory-access, and error path bugs" * tag 'linux-kselftest-kunit-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: kunit: Fix possible memory leak in kunit_filter_suites() kunit: Fix possible null-ptr-deref in kunit_parse_glob_filter() kunit: Fix the wrong err path and add goto labels in kunit_filter_suites() kunit: Fix wild-memory-access bug in kunit_free_suite_set() kunit: test: Make filter strings in executor_test writable
2 parents afe03f0 + 9076bc4 commit fb52c87

3 files changed

Lines changed: 43 additions & 21 deletions

File tree

‎lib/kunit/executor.c‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,36 @@ struct kunit_glob_filter {
6565
};
6666

6767
/* Split "suite_glob.test_glob" into two. Assumes filter_glob is not empty. */
68-
static void kunit_parse_glob_filter(struct kunit_glob_filter *parsed,
68+
static int kunit_parse_glob_filter(struct kunit_glob_filter *parsed,
6969
const char *filter_glob)
7070
{
7171
const int len = strlen(filter_glob);
7272
const char *period = strchr(filter_glob, '.');
7373

7474
if (!period) {
7575
parsed->suite_glob = kzalloc(len + 1, GFP_KERNEL);
76+
if (!parsed->suite_glob)
77+
return -ENOMEM;
78+
7679
parsed->test_glob = NULL;
7780
strcpy(parsed->suite_glob, filter_glob);
78-
return;
81+
return 0;
7982
}
8083

8184
parsed->suite_glob = kzalloc(period - filter_glob + 1, GFP_KERNEL);
85+
if (!parsed->suite_glob)
86+
return -ENOMEM;
87+
8288
parsed->test_glob = kzalloc(len - (period - filter_glob) + 1, GFP_KERNEL);
89+
if (!parsed->test_glob) {
90+
kfree(parsed->suite_glob);
91+
return -ENOMEM;
92+
}
8393

8494
strncpy(parsed->suite_glob, filter_glob, period - filter_glob);
8595
strncpy(parsed->test_glob, period + 1, len - (period - filter_glob));
96+
97+
return 0;
8698
}
8799

88100
/* Create a copy of suite with only tests that match test_glob. */
@@ -152,21 +164,24 @@ kunit_filter_suites(const struct kunit_suite_set *suite_set,
152164
}
153165
copy_start = copy;
154166

155-
if (filter_glob)
156-
kunit_parse_glob_filter(&parsed_glob, filter_glob);
167+
if (filter_glob) {
168+
*err = kunit_parse_glob_filter(&parsed_glob, filter_glob);
169+
if (*err)
170+
goto free_copy;
171+
}
157172

158173
/* Parse attribute filters */
159174
if (filters) {
160175
filter_count = kunit_get_filter_count(filters);
161176
parsed_filters = kcalloc(filter_count, sizeof(*parsed_filters), GFP_KERNEL);
162177
if (!parsed_filters) {
163-
kfree(copy);
164-
return filtered;
178+
*err = -ENOMEM;
179+
goto free_parsed_glob;
165180
}
166181
for (j = 0; j < filter_count; j++)
167182
parsed_filters[j] = kunit_next_attr_filter(&filters, err);
168183
if (*err)
169-
goto err;
184+
goto free_parsed_filters;
170185
}
171186

172187
for (i = 0; &suite_set->start[i] != suite_set->end; i++) {
@@ -178,7 +193,7 @@ kunit_filter_suites(const struct kunit_suite_set *suite_set,
178193
parsed_glob.test_glob);
179194
if (IS_ERR(filtered_suite)) {
180195
*err = PTR_ERR(filtered_suite);
181-
goto err;
196+
goto free_parsed_filters;
182197
}
183198
}
184199
if (filter_count > 0 && parsed_filters != NULL) {
@@ -195,10 +210,11 @@ kunit_filter_suites(const struct kunit_suite_set *suite_set,
195210
filtered_suite = new_filtered_suite;
196211

197212
if (*err)
198-
goto err;
213+
goto free_parsed_filters;
214+
199215
if (IS_ERR(filtered_suite)) {
200216
*err = PTR_ERR(filtered_suite);
201-
goto err;
217+
goto free_parsed_filters;
202218
}
203219
if (!filtered_suite)
204220
break;
@@ -213,17 +229,19 @@ kunit_filter_suites(const struct kunit_suite_set *suite_set,
213229
filtered.start = copy_start;
214230
filtered.end = copy;
215231

216-
err:
217-
if (*err)
218-
kfree(copy);
232+
free_parsed_filters:
233+
if (filter_count)
234+
kfree(parsed_filters);
219235

236+
free_parsed_glob:
220237
if (filter_glob) {
221238
kfree(parsed_glob.suite_glob);
222239
kfree(parsed_glob.test_glob);
223240
}
224241

225-
if (filter_count)
226-
kfree(parsed_filters);
242+
free_copy:
243+
if (*err)
244+
kfree(copy);
227245

228246
return filtered;
229247
}

‎lib/kunit/executor_test.c‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ static void parse_filter_attr_test(struct kunit *test)
119119
{
120120
int j, filter_count;
121121
struct kunit_attr_filter *parsed_filters;
122-
char *filters = "speed>slow, module!=example";
122+
char filters[] = "speed>slow, module!=example", *filter = filters;
123123
int err = 0;
124124

125125
filter_count = kunit_get_filter_count(filters);
@@ -128,7 +128,7 @@ static void parse_filter_attr_test(struct kunit *test)
128128
parsed_filters = kunit_kcalloc(test, filter_count, sizeof(*parsed_filters),
129129
GFP_KERNEL);
130130
for (j = 0; j < filter_count; j++) {
131-
parsed_filters[j] = kunit_next_attr_filter(&filters, &err);
131+
parsed_filters[j] = kunit_next_attr_filter(&filter, &err);
132132
KUNIT_ASSERT_EQ_MSG(test, err, 0, "failed to parse filter '%s'", filters[j]);
133133
}
134134

@@ -154,6 +154,7 @@ static void filter_attr_test(struct kunit *test)
154154
.start = subsuite, .end = &subsuite[2],
155155
};
156156
struct kunit_suite_set got;
157+
char filter[] = "speed>slow";
157158
int err = 0;
158159

159160
subsuite[0] = alloc_fake_suite(test, "normal_suite", dummy_attr_test_cases);
@@ -168,7 +169,7 @@ static void filter_attr_test(struct kunit *test)
168169
* attribute is unset and thus, the filtering is based on the parent attribute
169170
* of slow.
170171
*/
171-
got = kunit_filter_suites(&suite_set, NULL, "speed>slow", NULL, &err);
172+
got = kunit_filter_suites(&suite_set, NULL, filter, NULL, &err);
172173
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
173174
KUNIT_ASSERT_EQ(test, err, 0);
174175
kfree_at_end(test, got.start);
@@ -191,12 +192,13 @@ static void filter_attr_empty_test(struct kunit *test)
191192
.start = subsuite, .end = &subsuite[2],
192193
};
193194
struct kunit_suite_set got;
195+
char filter[] = "module!=dummy";
194196
int err = 0;
195197

196198
subsuite[0] = alloc_fake_suite(test, "suite1", dummy_attr_test_cases);
197199
subsuite[1] = alloc_fake_suite(test, "suite2", dummy_attr_test_cases);
198200

199-
got = kunit_filter_suites(&suite_set, NULL, "module!=dummy", NULL, &err);
201+
got = kunit_filter_suites(&suite_set, NULL, filter, NULL, &err);
200202
KUNIT_ASSERT_EQ(test, err, 0);
201203
kfree_at_end(test, got.start); /* just in case */
202204

@@ -211,12 +213,13 @@ static void filter_attr_skip_test(struct kunit *test)
211213
.start = subsuite, .end = &subsuite[1],
212214
};
213215
struct kunit_suite_set got;
216+
char filter[] = "speed>slow";
214217
int err = 0;
215218

216219
subsuite[0] = alloc_fake_suite(test, "suite", dummy_attr_test_cases);
217220

218221
/* Want: suite(slow, normal), NULL -> suite(slow with SKIP, normal), NULL */
219-
got = kunit_filter_suites(&suite_set, NULL, "speed>slow", "skip", &err);
222+
got = kunit_filter_suites(&suite_set, NULL, filter, "skip", &err);
220223
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
221224
KUNIT_ASSERT_EQ(test, err, 0);
222225
kfree_at_end(test, got.start);

‎lib/kunit/test.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,12 +784,13 @@ static int kunit_module_notify(struct notifier_block *nb, unsigned long val,
784784

785785
switch (val) {
786786
case MODULE_STATE_LIVE:
787-
kunit_module_init(mod);
788787
break;
789788
case MODULE_STATE_GOING:
790789
kunit_module_exit(mod);
791790
break;
792791
case MODULE_STATE_COMING:
792+
kunit_module_init(mod);
793+
break;
793794
case MODULE_STATE_UNFORMED:
794795
break;
795796
}

0 commit comments

Comments
 (0)