On Tue, Nov 23, 2021 at 10:02 PM Alexei Starovoitov
<alexei.starovoitov@xxxxxxxxx> wrote:
>
> From: Alexei Starovoitov <ast@xxxxxxxxxx>
>
> The gen_loader has to clear attach_kind otherwise the programs
> without attach_btf_id will fail load if they follow programs
> with attach_btf_id.
>
> Fixes: 67234743736a ("libbpf: Generate loader program out of BPF ELF file.")
> Signed-off-by: Alexei Starovoitov <ast@xxxxxxxxxx>
> ---
Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
> tools/lib/bpf/gen_loader.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/lib/bpf/gen_loader.c b/tools/lib/bpf/gen_loader.c
> index 9066d1ae3461..3e9cc2312f0a 100644
> --- a/tools/lib/bpf/gen_loader.c
> +++ b/tools/lib/bpf/gen_loader.c
> @@ -1015,9 +1015,11 @@ void bpf_gen__prog_load(struct bpf_gen *gen,
> debug_ret(gen, "prog_load %s insn_cnt %d", attr.prog_name, attr.insn_cnt);
> /* successful or not, close btf module FDs used in extern ksyms and attach_btf_obj_fd */
> cleanup_relos(gen, insns_off);
> - if (gen->attach_kind)
> + if (gen->attach_kind) {
> emit_sys_close_blob(gen,
> attr_field(prog_load_attr, attach_btf_obj_fd));
> + gen->attach_kind = 0;
> + }
> emit_check_err(gen);
> /* remember prog_fd in the stack, if successful */
> emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_7,
> --
> 2.30.2
>
