netdev - Re: [PATCH bpf 1/3] libbpf: ensure umem pointer is non-NULL before dereferencing

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: <CAJ8uoz0VpWpcKQyWoDAY3=WwBotUvMQ2Nk5t33WJJK-a8QmWpg@mail.gmail.com>
Date:   Fri, 26 Mar 2021 10:14:47 +0100
From:   Magnus Karlsson <magnus.karlsson@...il.com>
To:     Ciara Loftus <ciara.loftus@...el.com>
Cc:     Network Development <netdev@...r.kernel.org>,
        bpf <bpf@...r.kernel.org>,
        "Karlsson, Magnus" <magnus.karlsson@...el.com>,
        Björn Töpel <bjorn@...nel.org>
Subject: Re: [PATCH bpf 1/3] libbpf: ensure umem pointer is non-NULL before dereferencing

On Wed, Mar 24, 2021 at 3:46 PM Ciara Loftus <ciara.loftus@...el.com> wrote:
>
> Calls to xsk_socket__create dereference the umem to access the
> fill_save and comp_save pointers. Make sure the umem is non-NULL
> before doing this.
>
> Fixes: 2f6324a3937f ("libbpf: Support shared umems between queues and devices")
>
> Signed-off-by: Ciara Loftus <ciara.loftus@...el.com>
> ---
>  tools/lib/bpf/xsk.c | 3 +++
>  1 file changed, 3 insertions(+)

Thank you for the fix!

Acked-by: Magnus Karlsson <magnus.karlsson@...el.com>

> diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c
> index 526fc35c0b23..443b0cfb45e8 100644
> --- a/tools/lib/bpf/xsk.c
> +++ b/tools/lib/bpf/xsk.c
> @@ -1019,6 +1019,9 @@ int xsk_socket__create(struct xsk_socket **xsk_ptr, const char *ifname,
>                        struct xsk_ring_cons *rx, struct xsk_ring_prod *tx,
>                        const struct xsk_socket_config *usr_config)
>  {
> +       if (!umem)
> +               return -EFAULT;
> +
>         return xsk_socket__create_shared(xsk_ptr, ifname, queue_id, umem,
>                                          rx, tx, umem->fill_save,
>                                          umem->comp_save, usr_config);
> --
> 2.17.1
>