From: Martin KaFai Lau <martin.lau@linux.dev>
To: Geliang Tang <geliang@kernel.org>
Cc: Geliang Tang <tanggeliang@kylinos.cn>,
Andrii Nakryiko <andrii@kernel.org>,
Eduard Zingerman <eddyz87@gmail.com>,
Mykola Lysenko <mykolal@fb.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>, Shuah Khan <shuah@kernel.org>,
bpf@vger.kernel.org, linux-kselftest@vger.kernel.org
Subject: Re: [PATCH bpf-next v4 09/14] selftests/bpf: Use log_err in network_helpers
Date: Wed, 17 Apr 2024 17:19:39 -0700 [thread overview]
Message-ID: <edbaf9f4-7ca9-43da-aeca-f605274461b7@linux.dev> (raw)
In-Reply-To: <efc8ea4e2c544f9959d7c265c80f4dac5e798c4a.1713262052.git.tanggeliang@kylinos.cn>
On 4/16/24 3:13 AM, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
>
> The helpers ASSERT_OK/GE/OK_PTR should avoid using in public functions.
> This patch uses log_err() to replace them in network_helpers.c, then
> uses ASSERT_OK_PTR() to check the return values of all open_netns().
>
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
> tools/testing/selftests/bpf/network_helpers.c | 19 ++++++++++++++-----
> .../selftests/bpf/prog_tests/empty_skb.c | 2 ++
> .../bpf/prog_tests/ip_check_defrag.c | 2 ++
> .../selftests/bpf/prog_tests/tc_redirect.c | 2 +-
> .../selftests/bpf/prog_tests/test_tunnel.c | 4 ++++
> .../selftests/bpf/prog_tests/xdp_metadata.c | 16 ++++++++++++++++
> 6 files changed, 39 insertions(+), 6 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
> index 836436688ca6..4fd3ab4fa72c 100644
> --- a/tools/testing/selftests/bpf/network_helpers.c
> +++ b/tools/testing/selftests/bpf/network_helpers.c
> @@ -458,22 +458,30 @@ struct nstoken *open_netns(const char *name)
> struct nstoken *token;
>
> token = calloc(1, sizeof(struct nstoken));
> - if (!ASSERT_OK_PTR(token, "malloc token"))
> + if (!token) {
> + log_err("Failed to malloc token");
> return NULL;
> + }
>
> token->orig_netns_fd = open("/proc/self/ns/net", O_RDONLY);
> - if (!ASSERT_GE(token->orig_netns_fd, 0, "open /proc/self/ns/net"))
> + if (token->orig_netns_fd <= 0) {
The test is incorrect. just test == -1.
Also, I think there is an existing bug that orig_netns_fd will be leaked in the
later "goto fail;" case.
> + log_err("Failed to open /proc/self/ns/net");
> goto fail;
> + }
>
> snprintf(nspath, sizeof(nspath), "%s/%s", "/var/run/netns", name);
> nsfd = open(nspath, O_RDONLY | O_CLOEXEC);
> - if (!ASSERT_GE(nsfd, 0, "open netns fd"))
> + if (nsfd <= 0) {
Same here.
> + log_err("Failed to open netns fd");
> goto fail;
I meant here regarding to the existing bug that leaks orig_netns_fd.
next prev parent reply other threads:[~2024-04-18 0:19 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-16 10:13 [PATCH bpf-next v4 00/14] use network helpers, part 1 Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 01/14] selftests/bpf: Update arguments of connect_to_addr Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 02/14] selftests/bpf: Add start_server_addr* helpers Geliang Tang
2024-04-18 0:08 ` Martin KaFai Lau
2024-04-16 10:13 ` [PATCH bpf-next v4 03/14] selftests/bpf: Use start_server_addr in cls_redirect Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 04/14] selftests/bpf: Use connect_to_addr " Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 05/14] selftests/bpf: Use start_server_addr in sk_assign Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 06/14] selftests/bpf: Use connect_to_addr " Geliang Tang
2024-04-18 0:15 ` Martin KaFai Lau
2024-04-16 10:13 ` [PATCH bpf-next v4 07/14] selftests/bpf: Use get_socket_local_port " Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 08/14] selftests/bpf: Use make_sockaddr " Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 09/14] selftests/bpf: Use log_err in network_helpers Geliang Tang
2024-04-18 0:19 ` Martin KaFai Lau [this message]
2024-04-16 10:13 ` [PATCH bpf-next v4 10/14] selftests/bpf: Use start_server_addr in test_sock_addr Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 11/14] selftests/bpf: Use connect_to_addr " Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 12/14] selftests/bpf: Use make_sockaddr " Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 13/14] selftests/bpf: Use make_sockaddr in test_sock Geliang Tang
2024-04-16 10:14 ` [PATCH bpf-next v4 14/14] selftests/bpf: Use make_sockaddr in ip_check_defrag Geliang Tang
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=edbaf9f4-7ca9-43da-aeca-f605274461b7@linux.dev \
--to=martin.lau@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=geliang@kernel.org \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@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=tanggeliang@kylinos.cn \
--cc=yonghong.song@linux.dev \
/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