netdev - Re: [bpf-next PATCH] bpf: fix bpftool without skeleton code enabled

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: <CAEf4BzYXxrmT3oBF470WvqDX0pv5RUnuuFb+S0kxzXzEs4nq_w@mail.gmail.com>
Date:   Mon, 6 Jul 2020 16:30:20 -0700
From:   Andrii Nakryiko <andrii.nakryiko@...il.com>
To:     John Fastabend <john.fastabend@...il.com>
Cc:     Andrii Nakryiko <andriin@...com>,
        Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Networking <netdev@...r.kernel.org>, bpf <bpf@...r.kernel.org>
Subject: Re: [bpf-next PATCH] bpf: fix bpftool without skeleton code enabled

On Thu, Jul 2, 2020 at 10:25 AM John Fastabend <john.fastabend@...il.com> wrote:
>
> Fix segfault from bpftool by adding emit_obj_refs_plain when skeleton
> code is disabled.
>
> Tested by deleting BUILD_BPF_SKELS in Makefile.
>
> # ./bpftool prog show
> Error: bpftool built without PID iterator support
> 3: cgroup_skb  tag 7be49e3934a125ba  gpl
>         loaded_at 2020-07-01T08:01:29-0700  uid 0
> Segmentation fault
>
> Signed-off-by: John Fastabend <john.fastabend@...il.com>
> ---

My bad, thanks for the fix!

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

>  tools/bpf/bpftool/pids.c |    1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/tools/bpf/bpftool/pids.c b/tools/bpf/bpftool/pids.c
> index 2709be4de2b1..7d5416667c85 100644
> --- a/tools/bpf/bpftool/pids.c
> +++ b/tools/bpf/bpftool/pids.c
> @@ -19,6 +19,7 @@ int build_obj_refs_table(struct obj_refs_table *table, enum bpf_obj_type type)
>         return -ENOTSUP;
>  }
>  void delete_obj_refs_table(struct obj_refs_table *table) {}
> +void emit_obj_refs_plain(struct obj_refs_table *table, __u32 id, const char *prefix) {}
>
>  #else /* BPFTOOL_WITHOUT_SKELETONS */
>
>