diff options
| author |   Alexei Starovoitov <ast@kernel.org> | 2021-12-01 10:10:34 -0800 |
|---|---|---|
| committer |   Andrii Nakryiko <andrii@kernel.org> | 2021-12-02 11:18:35 -0800 |
| commit | 19250f5fc0c283892a61f3abf9d65e6325f63897 (patch) | |
| tree | 3a9b52b764e95a54335645429c9942cf1e16db93 | |
| parent | libbpf: Support init of inner maps in light skeleton. (diff) | |
| download | linux-dev-19250f5fc0c283892a61f3abf9d65e6325f63897.tar.xz linux-dev-19250f5fc0c283892a61f3abf9d65e6325f63897.zip | |
libbpf: Clean gen_loader's attach kind.
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@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211201181040.23337-12-alexei.starovoitov@gmail.com
| -rw-r--r-- | tools/lib/bpf/gen_loader.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/lib/bpf/gen_loader.c b/tools/lib/bpf/gen_loader.c index ed0e949790da..21dfb930f1d2 100644 --- a/tools/lib/bpf/gen_loader.c +++ b/tools/lib/bpf/gen_loader.c @@ -1005,9 +1005,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, |