selftests/bpf: Add malloc failure checks in bpf_iter
authorYuran Pereira <yuran.pereira@hotmail.com>
Sat, 28 Oct 2023 05:24:14 +0000 (10:54 +0530)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 10 Nov 2023 02:58:38 +0000 (18:58 -0800)
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 <yuran.pereira@hotmail.com>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Acked-by: Kui-Feng Lee <thinker.li@gmail.com>
Link: https://lore.kernel.org/r/DB3PR10MB6835F0ECA792265FA41FC39BE8A3A@DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
tools/testing/selftests/bpf/prog_tests/bpf_iter.c

index 5e334d3d7ac236cc1ca3662fe80654c5eba82175..4e02093c2cbef4afae709191fbf9fdea3403ef71 100644 (file)
@@ -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"))