Skip to content

Commit 0d2902d

Browse files
JoseExpositoFomys
JoseExposito
authored and
Fomys
committed
drm/vkms: Assert if vkms_config_create_*() fails
Check that the value returned by the vkms_config_create_*() functions is valid. Otherwise, assert and finish the KUnit test. Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/dri-devel/aJTL6IFEBaI8gqtH@stanley.mountain/ Signed-off-by: José Expósito <jose.exposito89@gmail.com> Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://lore.kernel.org/r/20250811101529.150716-1-jose.exposito89@gmail.com Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
1 parent 9e05c8d commit 0d2902d

1 file changed

Lines changed: 46 additions & 5 deletions

File tree

‎drivers/gpu/drm/vkms/tests/vkms_config_test.c‎

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ static void vkms_config_test_get_planes(struct kunit *test)
200200
KUNIT_ASSERT_EQ(test, n_planes, 0);
201201

202202
plane_cfg1 = vkms_config_create_plane(config);
203+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_cfg1);
203204
vkms_config_for_each_plane(config, plane_cfg) {
204205
n_planes++;
205206
if (plane_cfg != plane_cfg1)
@@ -209,6 +210,7 @@ static void vkms_config_test_get_planes(struct kunit *test)
209210
n_planes = 0;
210211

211212
plane_cfg2 = vkms_config_create_plane(config);
213+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_cfg2);
212214
vkms_config_for_each_plane(config, plane_cfg) {
213215
n_planes++;
214216
if (plane_cfg != plane_cfg1 && plane_cfg != plane_cfg2)
@@ -242,13 +244,15 @@ static void vkms_config_test_get_crtcs(struct kunit *test)
242244
KUNIT_FAIL(test, "Unexpected CRTC");
243245

244246
crtc_cfg1 = vkms_config_create_crtc(config);
247+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_cfg1);
245248
KUNIT_ASSERT_EQ(test, vkms_config_get_num_crtcs(config), 1);
246249
vkms_config_for_each_crtc(config, crtc_cfg) {
247250
if (crtc_cfg != crtc_cfg1)
248251
KUNIT_FAIL(test, "Unexpected CRTC");
249252
}
250253

251254
crtc_cfg2 = vkms_config_create_crtc(config);
255+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_cfg2);
252256
KUNIT_ASSERT_EQ(test, vkms_config_get_num_crtcs(config), 2);
253257
vkms_config_for_each_crtc(config, crtc_cfg) {
254258
if (crtc_cfg != crtc_cfg1 && crtc_cfg != crtc_cfg2)
@@ -280,6 +284,7 @@ static void vkms_config_test_get_encoders(struct kunit *test)
280284
KUNIT_ASSERT_EQ(test, n_encoders, 0);
281285

282286
encoder_cfg1 = vkms_config_create_encoder(config);
287+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder_cfg1);
283288
vkms_config_for_each_encoder(config, encoder_cfg) {
284289
n_encoders++;
285290
if (encoder_cfg != encoder_cfg1)
@@ -289,6 +294,7 @@ static void vkms_config_test_get_encoders(struct kunit *test)
289294
n_encoders = 0;
290295

291296
encoder_cfg2 = vkms_config_create_encoder(config);
297+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder_cfg2);
292298
vkms_config_for_each_encoder(config, encoder_cfg) {
293299
n_encoders++;
294300
if (encoder_cfg != encoder_cfg1 && encoder_cfg != encoder_cfg2)
@@ -324,6 +330,7 @@ static void vkms_config_test_get_connectors(struct kunit *test)
324330
KUNIT_ASSERT_EQ(test, n_connectors, 0);
325331

326332
connector_cfg1 = vkms_config_create_connector(config);
333+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, connector_cfg1);
327334
vkms_config_for_each_connector(config, connector_cfg) {
328335
n_connectors++;
329336
if (connector_cfg != connector_cfg1)
@@ -333,6 +340,7 @@ static void vkms_config_test_get_connectors(struct kunit *test)
333340
n_connectors = 0;
334341

335342
connector_cfg2 = vkms_config_create_connector(config);
343+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, connector_cfg2);
336344
vkms_config_for_each_connector(config, connector_cfg) {
337345
n_connectors++;
338346
if (connector_cfg != connector_cfg1 &&
@@ -370,7 +378,7 @@ static void vkms_config_test_invalid_plane_number(struct kunit *test)
370378

371379
/* Invalid: Too many planes */
372380
for (n = 0; n <= 32; n++)
373-
vkms_config_create_plane(config);
381+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vkms_config_create_plane(config));
374382

375383
KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config));
376384

@@ -395,18 +403,21 @@ static void vkms_config_test_valid_plane_type(struct kunit *test)
395403

396404
/* Invalid: No primary plane */
397405
plane_cfg = vkms_config_create_plane(config);
406+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_cfg);
398407
vkms_config_plane_set_type(plane_cfg, DRM_PLANE_TYPE_OVERLAY);
399408
err = vkms_config_plane_attach_crtc(plane_cfg, crtc_cfg);
400409
KUNIT_EXPECT_EQ(test, err, 0);
401410
KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config));
402411

403412
/* Invalid: Multiple primary planes */
404413
plane_cfg = vkms_config_create_plane(config);
414+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_cfg);
405415
vkms_config_plane_set_type(plane_cfg, DRM_PLANE_TYPE_PRIMARY);
406416
err = vkms_config_plane_attach_crtc(plane_cfg, crtc_cfg);
407417
KUNIT_EXPECT_EQ(test, err, 0);
408418

409419
plane_cfg = vkms_config_create_plane(config);
420+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_cfg);
410421
vkms_config_plane_set_type(plane_cfg, DRM_PLANE_TYPE_PRIMARY);
411422
err = vkms_config_plane_attach_crtc(plane_cfg, crtc_cfg);
412423
KUNIT_EXPECT_EQ(test, err, 0);
@@ -419,11 +430,13 @@ static void vkms_config_test_valid_plane_type(struct kunit *test)
419430

420431
/* Invalid: Multiple cursor planes */
421432
plane_cfg = vkms_config_create_plane(config);
433+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_cfg);
422434
vkms_config_plane_set_type(plane_cfg, DRM_PLANE_TYPE_CURSOR);
423435
err = vkms_config_plane_attach_crtc(plane_cfg, crtc_cfg);
424436
KUNIT_EXPECT_EQ(test, err, 0);
425437

426438
plane_cfg = vkms_config_create_plane(config);
439+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_cfg);
427440
vkms_config_plane_set_type(plane_cfg, DRM_PLANE_TYPE_CURSOR);
428441
err = vkms_config_plane_attach_crtc(plane_cfg, crtc_cfg);
429442
KUNIT_EXPECT_EQ(test, err, 0);
@@ -437,12 +450,16 @@ static void vkms_config_test_valid_plane_type(struct kunit *test)
437450
/* Invalid: Second CRTC without primary plane */
438451
crtc_cfg = vkms_config_create_crtc(config);
439452
encoder_cfg = vkms_config_create_encoder(config);
453+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_cfg);
454+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder_cfg);
455+
440456
err = vkms_config_encoder_attach_crtc(encoder_cfg, crtc_cfg);
441457
KUNIT_EXPECT_EQ(test, err, 0);
442458
KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config));
443459

444460
/* Valid: Second CRTC with a primary plane */
445461
plane_cfg = vkms_config_create_plane(config);
462+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_cfg);
446463
vkms_config_plane_set_type(plane_cfg, DRM_PLANE_TYPE_PRIMARY);
447464
err = vkms_config_plane_attach_crtc(plane_cfg, crtc_cfg);
448465
KUNIT_EXPECT_EQ(test, err, 0);
@@ -486,7 +503,7 @@ static void vkms_config_test_invalid_crtc_number(struct kunit *test)
486503

487504
/* Invalid: Too many CRTCs */
488505
for (n = 0; n <= 32; n++)
489-
vkms_config_create_crtc(config);
506+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vkms_config_create_crtc(config));
490507

491508
KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config));
492509

@@ -509,7 +526,7 @@ static void vkms_config_test_invalid_encoder_number(struct kunit *test)
509526

510527
/* Invalid: Too many encoders */
511528
for (n = 0; n <= 32; n++)
512-
vkms_config_create_encoder(config);
529+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vkms_config_create_encoder(config));
513530

514531
KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config));
515532

@@ -531,12 +548,15 @@ static void vkms_config_test_valid_encoder_possible_crtcs(struct kunit *test)
531548

532549
/* Invalid: Encoder without a possible CRTC */
533550
encoder_cfg = vkms_config_create_encoder(config);
551+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder_cfg);
534552
KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config));
535553

536554
/* Valid: Second CRTC with shared encoder */
537555
crtc_cfg2 = vkms_config_create_crtc(config);
538-
539556
plane_cfg = vkms_config_create_plane(config);
557+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_cfg2);
558+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_cfg);
559+
540560
vkms_config_plane_set_type(plane_cfg, DRM_PLANE_TYPE_PRIMARY);
541561
err = vkms_config_plane_attach_crtc(plane_cfg, crtc_cfg2);
542562
KUNIT_EXPECT_EQ(test, err, 0);
@@ -577,7 +597,7 @@ static void vkms_config_test_invalid_connector_number(struct kunit *test)
577597

578598
/* Invalid: Too many connectors */
579599
for (n = 0; n <= 32; n++)
580-
connector_cfg = vkms_config_create_connector(config);
600+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vkms_config_create_connector(config));
581601

582602
KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config));
583603

@@ -669,13 +689,19 @@ static void vkms_config_test_plane_attach_crtc(struct kunit *test)
669689
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, config);
670690

671691
overlay_cfg = vkms_config_create_plane(config);
692+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, overlay_cfg);
672693
vkms_config_plane_set_type(overlay_cfg, DRM_PLANE_TYPE_OVERLAY);
694+
673695
primary_cfg = vkms_config_create_plane(config);
696+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, primary_cfg);
674697
vkms_config_plane_set_type(primary_cfg, DRM_PLANE_TYPE_PRIMARY);
698+
675699
cursor_cfg = vkms_config_create_plane(config);
700+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, cursor_cfg);
676701
vkms_config_plane_set_type(cursor_cfg, DRM_PLANE_TYPE_CURSOR);
677702

678703
crtc_cfg = vkms_config_create_crtc(config);
704+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_cfg);
679705

680706
/* No primary or cursor planes */
681707
KUNIT_EXPECT_NULL(test, vkms_config_crtc_primary_plane(config, crtc_cfg));
@@ -735,6 +761,11 @@ static void vkms_config_test_plane_get_possible_crtcs(struct kunit *test)
735761
crtc_cfg1 = vkms_config_create_crtc(config);
736762
crtc_cfg2 = vkms_config_create_crtc(config);
737763

764+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_cfg1);
765+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_cfg2);
766+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_cfg1);
767+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_cfg2);
768+
738769
/* No possible CRTCs */
739770
vkms_config_plane_for_each_possible_crtc(plane_cfg1, idx, possible_crtc)
740771
KUNIT_FAIL(test, "Unexpected possible CRTC");
@@ -799,6 +830,11 @@ static void vkms_config_test_encoder_get_possible_crtcs(struct kunit *test)
799830
crtc_cfg1 = vkms_config_create_crtc(config);
800831
crtc_cfg2 = vkms_config_create_crtc(config);
801832

833+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder_cfg1);
834+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder_cfg2);
835+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_cfg1);
836+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_cfg2);
837+
802838
/* No possible CRTCs */
803839
vkms_config_encoder_for_each_possible_crtc(encoder_cfg1, idx, possible_crtc)
804840
KUNIT_FAIL(test, "Unexpected possible CRTC");
@@ -863,6 +899,11 @@ static void vkms_config_test_connector_get_possible_encoders(struct kunit *test)
863899
encoder_cfg1 = vkms_config_create_encoder(config);
864900
encoder_cfg2 = vkms_config_create_encoder(config);
865901

902+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, connector_cfg1);
903+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, connector_cfg2);
904+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder_cfg1);
905+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder_cfg2);
906+
866907
/* No possible encoders */
867908
vkms_config_connector_for_each_possible_encoder(connector_cfg1, idx,
868909
possible_encoder)

0 commit comments

Comments
 (0)