Re: [PATCH bpf-next v2] libbpf: Don't return -EINVAL if hdr_len < offsetofend(core_relo_len)

[Andrii Nakryiko]

On Wed, Mar 16, 2022 at 7:52 AM Yuntao Wang <ytcoode@xxxxxxxxx> wrote:
>
> Since core relos is an optional part of the .BTF.ext ELF section, we should
> skip parsing it instead of returning -EINVAL if header size is less than
> offsetofend(struct btf_ext_header, core_relo_len).
>
> Fixes: e9fc3ce99b34 ("libbpf: Streamline error reporting for high-level APIs")
> Signed-off-by: Yuntao Wang <ytcoode@xxxxxxxxx>
> ---
> v1 -> v2: skip core relos if hdr_len < offsetofend(core_relo_len)
>

Seems like this never made it to Patchworks. Can you please trim down
the CC list and resubmit?

>  tools/lib/bpf/btf.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
> index 1383e26c5d1f..9b7196b21498 100644
> --- a/tools/lib/bpf/btf.c
> +++ b/tools/lib/bpf/btf.c
> @@ -2826,10 +2826,8 @@ struct btf_ext *btf_ext__new(const __u8 *data, __u32 size)
>         if (err)
>                 goto done;
>
> -       if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len)) {
> -               err = -EINVAL;
> -               goto done;
> -       }
> +       if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, core_relo_len))
> +               goto done; // skip core relos parsing

don't use C++-style comments, only /* */

>
>         err = btf_ext_setup_core_relos(btf_ext);
>         if (err)
> --
> 2.35.1
>