Re: [PATCH bpf-next 2/3] libbpf: skip BTF fixup if object file has no BTF

[Jiri Olsa]

On Fri, Mar 19, 2021 at 01:59:08PM -0700, Andrii Nakryiko wrote:
> Skip BTF fixup step when input object file is missing BTF altogether.
> 
> Reported-by: Jiri Olsa <jo...@redhat.com>
> Fixes: 8fd27bf69b86 ("libbpf: Add BPF static linker BTF and BTF.ext support")
> Signed-off-by: Andrii Nakryiko <and...@kernel.org>

Tested-by: Jiri Olsa <jo...@redhat.com>

thanks for the quick fix,
jirka

> ---
>  tools/lib/bpf/linker.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/tools/lib/bpf/linker.c b/tools/lib/bpf/linker.c
> index b4fff912dce2..5e0aa2f2c0ca 100644
> --- a/tools/lib/bpf/linker.c
> +++ b/tools/lib/bpf/linker.c
> @@ -1313,6 +1313,9 @@ static int linker_fixup_btf(struct src_obj *obj)
>       struct src_sec *sec;
>       int i, j, n, m;
>  
> +     if (!obj->btf)
> +             return 0;
> +
>       n = btf__get_nr_types(obj->btf);
>       for (i = 1; i <= n; i++) {
>               struct btf_var_secinfo *vi;
> -- 
> 2.30.2
>