diff options
| author | Sean Anderson <seanga2@gmail.com> | 2023-10-28 18:57:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-16 16:21:38 -0500 |
| commit | 2a1812de208168f2f4edeb48e8da6b12315ff77f (patch) | |
| tree | 5e89e76952cb6d0c850ca45acc416be3c7d21f85 | |
| parent | 1125e291fbc5ee977a296065d24694a4861785fa (diff) | |
| download | u-boot-2a1812de208168f2f4edeb48e8da6b12315ff77f.tar.gz u-boot-2a1812de208168f2f4edeb48e8da6b12315ff77f.tar.bz2 u-boot-2a1812de208168f2f4edeb48e8da6b12315ff77f.zip | |
test: eth: Don't crash if env_get returns NULL
env_get can return NULL if it fails to find the variable. Check its result
before using it.
Fixes: 6d9764c2a87 ("dm: test: Add a new test case against dm eth codes for NULL pointer access")
Fixes: df33fd28897 ("test: eth: Add test for ethernet addresses")
Signed-off-by: Sean Anderson <seanga2@gmail.com>
| -rw-r--r-- | test/dm/eth.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/test/dm/eth.c b/test/dm/eth.c index d05d2a9abe..bb3dcc6b95 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -263,12 +263,16 @@ static int dm_test_eth_act(struct unit_test_state *uts) /* Prepare the test scenario */ for (i = 0; i < DM_TEST_ETH_NUM; i++) { + char *addr; + ut_assertok(uclass_find_device_by_name(UCLASS_ETH, ethname[i], &dev[i])); ut_assertok(device_remove(dev[i], DM_REMOVE_NORMAL)); /* Invalidate MAC address */ - strncpy(ethaddr[i], env_get(addrname[i]), 17); + addr = env_get(addrname[i]); + ut_assertnonnull(addr); + strncpy(ethaddr[i], addr, 17); /* Must disable access protection for ethaddr before clearing */ env_set(".flags", addrname[i]); env_set(addrname[i], NULL); @@ -312,12 +316,16 @@ static int dm_test_ethaddr(struct unit_test_state *uts) for (i = 0; i < ARRAY_SIZE(addr); i++) { char addrname[10]; + char *env_addr; if (i) snprintf(addrname, sizeof(addrname), "eth%daddr", i + 1); else strcpy(addrname, "ethaddr"); - ut_asserteq_str(addr[i], env_get(addrname)); + + env_addr = env_get(addrname); + ut_assertnonnull(env_addr); + ut_asserteq_str(addr[i], env_addr); } return 0; |