lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0215/1039] libbpf: Clean gen_loaders attach kind.
    Date
    From: Alexei Starovoitov <ast@kernel.org>

    [ Upstream commit 19250f5fc0c283892a61f3abf9d65e6325f63897 ]

    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
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 5aad39e92a7a5..4ac65afc99e50 100644
    --- a/tools/lib/bpf/gen_loader.c
    +++ b/tools/lib/bpf/gen_loader.c
    @@ -993,9 +993,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);
    - 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.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:09    [W:4.018 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site