From: Yonghong Song <yonghong.song@linux.dev>
To: thinker.li@gmail.com, bpf@vger.kernel.org, ast@kernel.org,
martin.lau@linux.dev, song@kernel.org, kernel-team@meta.com,
andrii@kernel.org, dan.carpenter@linaro.org
Cc: sinquersw@gmail.com, kuifeng@meta.com
Subject: Re: [PATCH bpf-next] selftests/bpf: fix the incorrect verification of port numbers.
Date: Thu, 3 Aug 2023 18:30:25 -0700 [thread overview]
Message-ID: <2501f80c-23c6-a509-fd6a-c44797d9f345@linux.dev> (raw)
In-Reply-To: <20230803215316.688220-1-thinker.li@gmail.com>
On 8/3/23 2:53 PM, thinker.li@gmail.com wrote:
> From: Kui-Feng Lee <thinker.li@gmail.com>
>
> Check port numbers before calling htons().
>
> According to Dan Carpenter's report, Smatch identified incorrect port
> number checks. It is expected that the returned port number is an integer,
> with negative numbers indicating errors. However, the value was mistakenly
> verified after being translated by htons().
>
> Fixes: 8a8c2231cab2 ("selftests/bpf: fix the incorrect verification of port numbers.")
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Closes: https://lore.kernel.org/bpf/cafd6585-d5a2-4096-b94f-7556f5aa7737@moroto.mountain/
> Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
Ack with a small nit below.
Acked-by: Yonghong Song <yonghong.song@linux.dev>
> ---
> tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c b/tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c
> index 95bab61a1e57..0df95bc88a9b 100644
> --- a/tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c
> +++ b/tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c
> @@ -110,11 +110,13 @@ static int connect_client_server_v6(int client_fd, int listen_fd)
> .sin6_family = AF_INET6,
> .sin6_addr = IN6ADDR_LOOPBACK_INIT,
> };
> + int port;
> int err;
No need for a separate line for 'int port'.
Just doing 'int err, port;' sounds better.
>
> - addr.sin6_port = htons(get_sock_port_v6(listen_fd));
> - if (addr.sin6_port < 0)
> + port = get_sock_port_v6(listen_fd);
> + if (port < 0)
> return -1;
> + addr.sin6_port = htons(port);
>
> err = connect(client_fd, (struct sockaddr *)&addr, sizeof(addr));
> if (err < 0) {
next prev parent reply other threads:[~2023-08-04 1:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 21:53 [PATCH bpf-next] selftests/bpf: fix the incorrect verification of port numbers thinker.li
2023-08-04 1:30 ` Yonghong Song [this message]
2023-08-04 16:14 ` Kui-Feng Lee
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=2501f80c-23c6-a509-fd6a-c44797d9f345@linux.dev \
--to=yonghong.song@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=dan.carpenter@linaro.org \
--cc=kernel-team@meta.com \
--cc=kuifeng@meta.com \
--cc=martin.lau@linux.dev \
--cc=sinquersw@gmail.com \
--cc=song@kernel.org \
--cc=thinker.li@gmail.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