All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH bpf] bpf: selftests: Fix error checking on reading the tcp_fastopen sysctl
@ 2020-02-11 17:59 Martin KaFai Lau
  2020-02-12  0:40 ` Andrii Nakryiko
  2020-02-12 16:50 ` Daniel Borkmann
  0 siblings, 2 replies; 3+ messages in thread
From: Martin KaFai Lau @ 2020-02-11 17:59 UTC (permalink / raw)
  To: bpf
  Cc: Alexei Starovoitov, Daniel Borkmann, David Miller, kernel-team, netdev

There is a typo in checking the "saved_tcp_fo" and instead
"saved_tcp_syncookie" is checked again.  This patch fixes it
and also breaks them into separate if statements such that
the test will abort asap.

Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Martin KaFai Lau <kafai@fb.com>
---
 tools/testing/selftests/bpf/prog_tests/select_reuseport.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
index 098bcae5f827..b577666d028e 100644
--- a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
+++ b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
@@ -822,8 +822,10 @@ void test_select_reuseport(void)
 		goto out;
 
 	saved_tcp_fo = read_int_sysctl(TCP_FO_SYSCTL);
+	if (saved_tcp_fo < 0)
+		goto out;
 	saved_tcp_syncookie = read_int_sysctl(TCP_SYNCOOKIE_SYSCTL);
-	if (saved_tcp_syncookie < 0 || saved_tcp_syncookie < 0)
+	if (saved_tcp_syncookie < 0)
 		goto out;
 
 	if (enable_fastopen())
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH bpf] bpf: selftests: Fix error checking on reading the tcp_fastopen sysctl
  2020-02-11 17:59 [PATCH bpf] bpf: selftests: Fix error checking on reading the tcp_fastopen sysctl Martin KaFai Lau
@ 2020-02-12  0:40 ` Andrii Nakryiko
  2020-02-12 16:50 ` Daniel Borkmann
  1 sibling, 0 replies; 3+ messages in thread
From: Andrii Nakryiko @ 2020-02-12  0:40 UTC (permalink / raw)
  To: Martin KaFai Lau
  Cc: bpf, Alexei Starovoitov, Daniel Borkmann, David Miller,
	Kernel Team, Networking

On Tue, Feb 11, 2020 at 1:32 PM Martin KaFai Lau <kafai@fb.com> wrote:
>
> There is a typo in checking the "saved_tcp_fo" and instead
> "saved_tcp_syncookie" is checked again.  This patch fixes it
> and also breaks them into separate if statements such that
> the test will abort asap.
>
> Reported-by: David Binderman <dcb314@hotmail.com>
> Signed-off-by: Martin KaFai Lau <kafai@fb.com>
> ---

Acked-by: Andrii Nakryiko <andriin@fb.com>

>  tools/testing/selftests/bpf/prog_tests/select_reuseport.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
> index 098bcae5f827..b577666d028e 100644
> --- a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
> +++ b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
> @@ -822,8 +822,10 @@ void test_select_reuseport(void)
>                 goto out;
>
>         saved_tcp_fo = read_int_sysctl(TCP_FO_SYSCTL);
> +       if (saved_tcp_fo < 0)
> +               goto out;
>         saved_tcp_syncookie = read_int_sysctl(TCP_SYNCOOKIE_SYSCTL);
> -       if (saved_tcp_syncookie < 0 || saved_tcp_syncookie < 0)
> +       if (saved_tcp_syncookie < 0)
>                 goto out;
>
>         if (enable_fastopen())
> --
> 2.17.1
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH bpf] bpf: selftests: Fix error checking on reading the tcp_fastopen sysctl
  2020-02-11 17:59 [PATCH bpf] bpf: selftests: Fix error checking on reading the tcp_fastopen sysctl Martin KaFai Lau
  2020-02-12  0:40 ` Andrii Nakryiko
@ 2020-02-12 16:50 ` Daniel Borkmann
  1 sibling, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2020-02-12 16:50 UTC (permalink / raw)
  To: Martin KaFai Lau, bpf
  Cc: Alexei Starovoitov, David Miller, kernel-team, netdev

On 2/11/20 6:59 PM, Martin KaFai Lau wrote:
> There is a typo in checking the "saved_tcp_fo" and instead
> "saved_tcp_syncookie" is checked again.  This patch fixes it
> and also breaks them into separate if statements such that
> the test will abort asap.
> 
> Reported-by: David Binderman <dcb314@hotmail.com>
> Signed-off-by: Martin KaFai Lau <kafai@fb.com>

Applied, thanks!

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-02-12 16:50 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-11 17:59 [PATCH bpf] bpf: selftests: Fix error checking on reading the tcp_fastopen sysctl Martin KaFai Lau
2020-02-12  0:40 ` Andrii Nakryiko
2020-02-12 16:50 ` Daniel Borkmann

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.