| Message ID | DB3PR10MB6835F0ECA792265FA41FC39BE8A3A@DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bf4a64b9323f181df8aba32d66cb37b9fa5df959 |
| Headers | show |
| Series | selftests/bpf: Replaces CHECK macros and adds malloc failure checks to bpf_iter | expand |
On 10/27/23 10:24 PM, Yuran Pereira wrote: > 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> On 10/27/23 22:24, Yuran Pereira wrote: > 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> > --- > tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c > index 123a3502b8f0..1e02d1ba1c18 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"))
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c index 123a3502b8f0..1e02d1ba1c18 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"))
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> --- tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)