netdev - Re: [PATCH bpf-next] libbpf: don't use kernel-side u32 type in xsk.c

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAJ+HfNgOHwSDpkMh=+Z42V5Y2K+-BsTkuux7XCO=5Qk=d6hSLg@mail.gmail.com>
Date:   Tue, 29 Oct 2019 09:19:41 +0100
From:   Björn Töpel <bjorn.topel@...il.com>
To:     Andrii Nakryiko <andriin@...com>
Cc:     bpf <bpf@...r.kernel.org>, Netdev <netdev@...r.kernel.org>,
        Alexei Starovoitov <ast@...com>,
        Daniel Borkmann <daniel@...earbox.net>,
        Andrii Nakryiko <andrii.nakryiko@...il.com>,
        Kernel Team <kernel-team@...com>,
        Magnus Karlsson <magnus.karlsson@...el.com>
Subject: Re: [PATCH bpf-next] libbpf: don't use kernel-side u32 type in xsk.c

On Tue, 29 Oct 2019 at 08:26, Andrii Nakryiko <andriin@...com> wrote:
>
> u32 is a kernel-side typedef. User-space library is supposed to use __u32.
> This breaks Github's projection of libbpf. Do u32 -> __u32 fix.
>
> Fixes: 94ff9ebb49a5 ("libbpf: Fix compatibility for kernels without need_wakeup")
> Cc: Magnus Karlsson <magnus.karlsson@...el.com>
> Signed-off-by: Andrii Nakryiko <andriin@...com>

Thanks Andrii!

Acked-by: Björn Töpel <bjorn.topel@...el.com>

> ---
>  tools/lib/bpf/xsk.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c
> index d54111133123..74d84f36a5b2 100644
> --- a/tools/lib/bpf/xsk.c
> +++ b/tools/lib/bpf/xsk.c
> @@ -161,22 +161,22 @@ static void xsk_mmap_offsets_v1(struct xdp_mmap_offsets *off)
>         off->rx.producer = off_v1.rx.producer;
>         off->rx.consumer = off_v1.rx.consumer;
>         off->rx.desc = off_v1.rx.desc;
> -       off->rx.flags = off_v1.rx.consumer + sizeof(u32);
> +       off->rx.flags = off_v1.rx.consumer + sizeof(__u32);
>
>         off->tx.producer = off_v1.tx.producer;
>         off->tx.consumer = off_v1.tx.consumer;
>         off->tx.desc = off_v1.tx.desc;
> -       off->tx.flags = off_v1.tx.consumer + sizeof(u32);
> +       off->tx.flags = off_v1.tx.consumer + sizeof(__u32);
>
>         off->fr.producer = off_v1.fr.producer;
>         off->fr.consumer = off_v1.fr.consumer;
>         off->fr.desc = off_v1.fr.desc;
> -       off->fr.flags = off_v1.fr.consumer + sizeof(u32);
> +       off->fr.flags = off_v1.fr.consumer + sizeof(__u32);
>
>         off->cr.producer = off_v1.cr.producer;
>         off->cr.consumer = off_v1.cr.consumer;
>         off->cr.desc = off_v1.cr.desc;
> -       off->cr.flags = off_v1.cr.consumer + sizeof(u32);
> +       off->cr.flags = off_v1.cr.consumer + sizeof(__u32);
>  }
>
>  static int xsk_get_mmap_offsets(int fd, struct xdp_mmap_offsets *off)
> --
> 2.17.1
>