2023-10-26 02:06:05

by Yuran Pereira

Subject: [PATCH bpf-next v2 2/2] 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]>
---
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 7db6972ed952..955d374ba656 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 */
@@ -869,6 +869,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"))
@@ -1046,6 +1048,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"))
--
2.25.1

2023-10-26 04:42:48

by Kui-Feng Lee

Subject: Re: [PATCH bpf-next v2 2/2] selftests/bpf: Add malloc failure checks in bpf_iter

Good job! LGTM

Acked-by: Kui-Feng Lee <[email protected]>


On 10/25/23 19:03, 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 <[email protected]>
> ---
> 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 7db6972ed952..955d374ba656 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 */
> @@ -869,6 +869,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"))
> @@ -1046,6 +1048,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"))

2023-10-27 04:38:32

by Yonghong Song

Subject: Re: [PATCH bpf-next v2 2/2] selftests/bpf: Add malloc failure checks in bpf_iter

On 10/25/23 7:03 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 <[email protected]>

Acked-by: Yonghong Song <[email protected]>