netdev - Re: [PATCH] bpf: selftests build error in sockmap

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAADnVQJ0kSjGjj9N3Jt2t=i+aVWvJ8iUzuSJV90997gbX-Ah1Q@mail.gmail.com>
Date:   Mon, 10 Feb 2020 14:33:20 -0800
From:   Alexei Starovoitov <alexei.starovoitov@...il.com>
To:     Jakub Sitnicki <jakub@...udflare.com>
Cc:     John Fastabend <john.fastabend@...il.com>,
        Network Development <netdev@...r.kernel.org>,
        bpf <bpf@...r.kernel.org>, Daniel Borkmann <daniel@...earbox.net>
Subject: Re: [PATCH] bpf: selftests build error in sockmap_basic.c

On Mon, Feb 10, 2020 at 1:59 AM Jakub Sitnicki <jakub@...udflare.com> wrote:
>
> On Mon, Feb 10, 2020 at 05:44 AM GMT, John Fastabend wrote:
> > Fix following build error. We could push a tcp.h header into one of the
> > include paths, but I think its easy enough to simply pull in the three
> > defines we need here. If we end up using more of tcp.h at some point
> > we can pull it in later.
> >
> > /home/john/git/bpf/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c: In function ‘connected_socket_v4’:
> > /home/john/git/bpf/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c:20:11: error: ‘TCP_REPAIR_ON’ undeclared (first use in this function)
> >   repair = TCP_REPAIR_ON;
> >            ^
> > /home/john/git/bpf/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c:20:11: note: each undeclared identifier is reported only once for each function it appears in
> > /home/john/git/bpf/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c:29:11: error: ‘TCP_REPAIR_OFF_NO_WP’ undeclared (first use in this function)
> >   repair = TCP_REPAIR_OFF_NO_WP;
> >
> > Then with fix,
> >
> > $ ./test_progs -n 44
> > #44/1 sockmap create_update_free:OK
> > #44/2 sockhash create_update_free:OK
> > #44 sockmap_basic:OK
> >
> > Fixes: 5d3919a953c3c ("selftests/bpf: Test freeing sockmap/sockhash with a socket in it")
> > Signed-off-by: John Fastabend <john.fastabend@...il.com>
> > ---
> >  .../selftests/bpf/prog_tests/sockmap_basic.c       |    5 +++++
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
> > index 07f5b46..aa43e0b 100644
> > --- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
> > +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
> > @@ -3,6 +3,11 @@
> >
> >  #include "test_progs.h"
> >
> > +#define TCP_REPAIR           19      /* TCP sock is under repair right now */
> > +
> > +#define TCP_REPAIR_ON                1
> > +#define TCP_REPAIR_OFF_NO_WP -1      /* Turn off without window probes */
> > +
> >  static int connected_socket_v4(void)
> >  {
> >       struct sockaddr_in addr = {
>
> Neat, I haven't thought of that. Thank you for fixing up my mistake.
>
> Reviewed-by: Jakub Sitnicki <jakub@...udflare.com>

I also think this is the better approach.
Applied. Thanks.