dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

test/dm: check if devices exist

Browse Source 
Running 'ut dm' on the sandbox without -D or -d results in segmentation
faults due to NULL pointer dereferences.

Check that device pointers are non-NULL before using them.

Use ut_assertnonnull() for pointers instead of ut_assert().

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Tested-by: Philippe Reynes <philippe.reynes@softathome.com>
This commit is contained in:
Heinrich Schuchardt
2020-07-17 00:20:14 +02:00
committed by Simon Glass
parent 469f04e882
commit 105da6251a
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/dm/acpi.c
View File

@@ -190,7 +190,10 @@ DM_TEST(dm_test_acpi_get_table_revision,
static int dm_test_acpi_create_dmar(struct unit_test_state *uts) static int dm_test_acpi_create_dmar(struct unit_test_state *uts)
{ {
struct acpi_dmar dmar; struct acpi_dmar dmar;
struct udevice *cpu;
ut_assertok(uclass_first_device(UCLASS_CPU, &cpu));
ut_assertnonnull(cpu);
ut_assertok(acpi_create_dmar(&dmar, DMAR_INTR_REMAP)); ut_assertok(acpi_create_dmar(&dmar, DMAR_INTR_REMAP));
ut_asserteq(DMAR_INTR_REMAP, dmar.flags); ut_asserteq(DMAR_INTR_REMAP, dmar.flags);
ut_asserteq(32 - 1, dmar.host_address_width); ut_asserteq(32 - 1, dmar.host_address_width);

10
test/dm/core.c
View File

@@ -158,7 +158,7 @@ static int dm_test_autobind_uclass_pdata_alloc(struct unit_test_state *uts)
for (uclass_find_first_device(UCLASS_TEST, &dev); for (uclass_find_first_device(UCLASS_TEST, &dev);
dev; dev;
uclass_find_next_device(&dev)) { uclass_find_next_device(&dev)) {
ut_assert(dev); ut_assertnonnull(dev);
uc_pdata = dev_get_uclass_platdata(dev); uc_pdata = dev_get_uclass_platdata(dev);
ut_assert(uc_pdata); ut_assert(uc_pdata);
@@ -181,7 +181,7 @@ static int dm_test_autobind_uclass_pdata_valid(struct unit_test_state *uts)
for (uclass_find_first_device(UCLASS_TEST, &dev); for (uclass_find_first_device(UCLASS_TEST, &dev);
dev; dev;
uclass_find_next_device(&dev)) { uclass_find_next_device(&dev)) {
ut_assert(dev); ut_assertnonnull(dev);
uc_pdata = dev_get_uclass_platdata(dev); uc_pdata = dev_get_uclass_platdata(dev);
ut_assert(uc_pdata); ut_assert(uc_pdata);
@@ -747,11 +747,11 @@ static int dm_test_uclass_devices_find(struct unit_test_state *uts)
dev; dev;
ret = uclass_find_next_device(&dev)) { ret = uclass_find_next_device(&dev)) {
ut_assert(!ret); ut_assert(!ret);
ut_assert(dev); ut_assertnonnull(dev);
} }
ut_assertok(uclass_find_first_device(UCLASS_TEST_DUMMY, &dev)); ut_assertok(uclass_find_first_device(UCLASS_TEST_DUMMY, &dev));
ut_assert(!dev); ut_assertnull(dev);
return 0; return 0;
} }
@@ -778,7 +778,7 @@ static int dm_test_uclass_devices_find_by_name(struct unit_test_state *uts)
testdev; testdev;
ret = uclass_find_next_device(&testdev)) { ret = uclass_find_next_device(&testdev)) {
ut_assertok(ret); ut_assertok(ret);
ut_assert(testdev); ut_assertnonnull(testdev);
findret = uclass_find_device_by_name(UCLASS_TEST_FDT, findret = uclass_find_device_by_name(UCLASS_TEST_FDT,
testdev->name, testdev->name,

1
test/dm/devres.c
View File

@@ -153,6 +153,7 @@ static int dm_test_devres_phase(struct unit_test_state *uts)
* allocation created in the bind() method. * allocation created in the bind() method.
*/ */
ut_assertok(uclass_find_first_device(UCLASS_TEST_DEVRES, &dev)); ut_assertok(uclass_find_first_device(UCLASS_TEST_DEVRES, &dev));
ut_assertnonnull(dev);
devres_get_stats(dev, &stats); devres_get_stats(dev, &stats);
ut_asserteq(1, stats.allocs); ut_asserteq(1, stats.allocs);
ut_asserteq(TEST_DEVRES_SIZE, stats.total_size); ut_asserteq(TEST_DEVRES_SIZE, stats.total_size);

2
test/dm/test-fdt.c
View File

@@ -832,10 +832,12 @@ static int dm_test_fdt_phandle(struct unit_test_state *uts)
struct udevice *back, *dev, *dev2; struct udevice *back, *dev, *dev2;
ut_assertok(uclass_find_first_device(UCLASS_PANEL_BACKLIGHT, &back)); ut_assertok(uclass_find_first_device(UCLASS_PANEL_BACKLIGHT, &back));
ut_assertnonnull(back);
ut_asserteq(-ENOENT, uclass_find_device_by_phandle(UCLASS_REGULATOR, ut_asserteq(-ENOENT, uclass_find_device_by_phandle(UCLASS_REGULATOR,
back, "missing", &dev)); back, "missing", &dev));
ut_assertok(uclass_find_device_by_phandle(UCLASS_REGULATOR, back, ut_assertok(uclass_find_device_by_phandle(UCLASS_REGULATOR, back,
"power-supply", &dev)); "power-supply", &dev));
ut_assertnonnull(dev);
ut_asserteq(0, device_active(dev)); ut_asserteq(0, device_active(dev));
ut_asserteq_str("ldo1", dev->name); ut_asserteq_str("ldo1", dev->name);
ut_assertok(uclass_get_device_by_phandle(UCLASS_REGULATOR, back, ut_assertok(uclass_get_device_by_phandle(UCLASS_REGULATOR, back,

7
test/dm/virtio.c
View File

@@ -22,9 +22,11 @@ static int dm_test_virtio_base(struct unit_test_state *uts)
/* check probe success */ /* check probe success */
ut_assertok(uclass_first_device(UCLASS_VIRTIO, &bus)); ut_assertok(uclass_first_device(UCLASS_VIRTIO, &bus));
ut_assertnonnull(bus);
/* check the child virtio-blk device is bound */ /* check the child virtio-blk device is bound */
ut_assertok(device_find_first_child(bus, &dev)); ut_assertok(device_find_first_child(bus, &dev));
ut_assertnonnull(dev);
ut_assertok(strcmp(dev->name, "virtio-blk#0")); ut_assertok(strcmp(dev->name, "virtio-blk#0"));
/* check driver status */ /* check driver status */
@@ -49,15 +51,18 @@ static int dm_test_virtio_all_ops(struct unit_test_state *uts)
/* check probe success */ /* check probe success */
ut_assertok(uclass_first_device(UCLASS_VIRTIO, &bus)); ut_assertok(uclass_first_device(UCLASS_VIRTIO, &bus));
ut_assertnonnull(bus);
/* check the child virtio-blk device is bound */ /* check the child virtio-blk device is bound */
ut_assertok(device_find_first_child(bus, &dev)); ut_assertok(device_find_first_child(bus, &dev));
ut_assertnonnull(dev);
/* /*
* fake the virtio device probe by filling in uc_priv->vdev * fake the virtio device probe by filling in uc_priv->vdev
* which is used by virtio_find_vqs/virtio_del_vqs. * which is used by virtio_find_vqs/virtio_del_vqs.
*/ */
uc_priv = dev_get_uclass_priv(bus); uc_priv = dev_get_uclass_priv(bus);
ut_assertnonnull(uc_priv);
uc_priv->vdev = dev; uc_priv->vdev = dev;
/* test virtio_xxx APIs */ /* test virtio_xxx APIs */
@@ -106,9 +111,11 @@ static int dm_test_virtio_remove(struct unit_test_state *uts)
/* check probe success */ /* check probe success */
ut_assertok(uclass_first_device(UCLASS_VIRTIO, &bus)); ut_assertok(uclass_first_device(UCLASS_VIRTIO, &bus));
ut_assertnonnull(bus);
/* check the child virtio-blk device is bound */ /* check the child virtio-blk device is bound */
ut_assertok(device_find_first_child(bus, &dev)); ut_assertok(device_find_first_child(bus, &dev));
ut_assertnonnull(dev);
/* set driver status to VIRTIO_CONFIG_S_DRIVER_OK */ /* set driver status to VIRTIO_CONFIG_S_DRIVER_OK */
ut_assertok(virtio_set_status(dev, VIRTIO_CONFIG_S_DRIVER_OK)); ut_assertok(virtio_set_status(dev, VIRTIO_CONFIG_S_DRIVER_OK));