From: Kui-Feng Lee <sinquersw@gmail.com>
To: Yuran Pereira <yuran.pereira@hotmail.com>,
bpf@vger.kernel.org, yonghong.song@linux.dev
Cc: ast@kernel.org, brauner@kernel.org, daniel@iogearbox.net,
haoluo@google.com, iii@linux.ibm.com, john.fastabend@gmail.com,
jolsa@kernel.org, kpsingh@kernel.org, kuifeng@meta.com,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
mykolal@fb.com, sdf@google.com, shuah@kernel.org,
song@kernel.org, linux-kernel-mentees@lists.linuxfoundation.org
Subject: Re: [PATCH bpf-next v3 2/2] selftests/bpf: Add malloc failure checks in bpf_iter
Date: Mon, 30 Oct 2023 12:39:48 -0700 [thread overview]
Message-ID: <767f32a8-d00b-4bb9-bbea-f972caced064@gmail.com> (raw)
In-Reply-To: <DB3PR10MB6835F0ECA792265FA41FC39BE8A3A@DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM>
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"))
prev parent reply other threads:[~2023-10-30 19:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1698461732.git.yuran.pereira@hotmail.com>
2023-10-28 5:24 ` [PATCH bpf-next v3 0/2] selftests/bpf: Replaces CHECK macros and adds malloc failure checks to bpf_iter Yuran Pereira
2023-10-28 5:24 ` [PATCH bpf-next v3 1/2] selftests/bpf: Convert CHECK macros to ASSERT_* macros in bpf_iter Yuran Pereira
2023-10-29 17:06 ` Yonghong Song
2023-10-30 19:39 ` Kui-Feng Lee
2023-11-02 6:00 ` patchwork-bot+netdevbpf
2023-10-28 5:24 ` [PATCH bpf-next v3 2/2] selftests/bpf: Add malloc failure checks " Yuran Pereira
2023-10-29 17:07 ` Yonghong Song
2023-10-30 19:39 ` Kui-Feng Lee [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=767f32a8-d00b-4bb9-bbea-f972caced064@gmail.com \
--to=sinquersw@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brauner@kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=iii@linux.ibm.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuifeng@meta.com \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mykolal@fb.com \
--cc=sdf@google.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
--cc=yuran.pereira@hotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox