diff options
| author | Yuran Pereira <[email protected]> | 2023-10-28 05:24:14 +0000 |
|---|---|---|
| committer | Alexei Starovoitov <[email protected]> | 2023-11-10 02:58:38 +0000 |
| commit | bf4a64b9323f181df8aba32d66cb37b9fa5df959 (patch) | |
| tree | 493a8cb1eef21a668f7533858d443663e0431a72 | |
| parent | selftests/bpf: Convert CHECK macros to ASSERT_* macros in bpf_iter (diff) | |
| download | kernel-bf4a64b9323f181df8aba32d66cb37b9fa5df959.tar.gz kernel-bf4a64b9323f181df8aba32d66cb37b9fa5df959.zip | |
selftests/bpf: Add malloc failure checks in bpf_iter
Since some malloc calls in bpf_iter may at times fail,
this patch adds the appropriate fail checks, and ensures that
any previously allocated resource is appropriately destroyed
before returning the function.
Signed-off-by: Yuran Pereira <[email protected]>
Acked-by: Yonghong Song <[email protected]>
Acked-by: Kui-Feng Lee <[email protected]>
Link: https://lore.kernel.org/r/DB3PR10MB6835F0ECA792265FA41FC39BE8A3A@DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM
Signed-off-by: Alexei Starovoitov <[email protected]>
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c index 5e334d3d7ac2..4e02093c2cbe 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c @@ -698,7 +698,7 @@ static void test_overflow(bool test_e2big_overflow, bool ret1) goto free_link; buf = malloc(expected_read_len); - if (!buf) + if (!ASSERT_OK_PTR(buf, "malloc")) goto close_iter; /* do read */ @@ -868,6 +868,8 @@ static void test_bpf_percpu_hash_map(void) skel->rodata->num_cpus = bpf_num_possible_cpus(); val = malloc(8 * bpf_num_possible_cpus()); + if (!ASSERT_OK_PTR(val, "malloc")) + goto out; err = bpf_iter_bpf_percpu_hash_map__load(skel); if (!ASSERT_OK_PTR(skel, "bpf_iter_bpf_percpu_hash_map__load")) @@ -1044,6 +1046,8 @@ static void test_bpf_percpu_array_map(void) skel->rodata->num_cpus = bpf_num_possible_cpus(); val = malloc(8 * bpf_num_possible_cpus()); + if (!ASSERT_OK_PTR(val, "malloc")) + goto out; err = bpf_iter_bpf_percpu_array_map__load(skel); if (!ASSERT_OK_PTR(skel, "bpf_iter_bpf_percpu_array_map__load")) |