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 0170/1039] tools/resolve_btf_ids: Close ELF file on error
    Date
    From: Andrii Nakryiko <andrii@kernel.org>

    [ Upstream commit 1144ab9bdf3430e1b5b3f22741e5283841951add ]

    Fix one case where we don't do explicit clean up.

    Fixes: fbbb68de80a4 ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object")
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Link: https://lore.kernel.org/bpf/20211124002325.1737739-2-andrii@kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/bpf/resolve_btfids/main.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c
    index 73409e27be01f..5d26f3c6f918e 100644
    --- a/tools/bpf/resolve_btfids/main.c
    +++ b/tools/bpf/resolve_btfids/main.c
    @@ -168,7 +168,7 @@ static struct btf_id *btf_id__find(struct rb_root *root, const char *name)
    return NULL;
    }

    -static struct btf_id*
    +static struct btf_id *
    btf_id__add(struct rb_root *root, char *name, bool unique)
    {
    struct rb_node **p = &root->rb_node;
    @@ -732,7 +732,8 @@ int main(int argc, const char **argv)
    if (obj.efile.idlist_shndx == -1 ||
    obj.efile.symbols_shndx == -1) {
    pr_debug("Cannot find .BTF_ids or symbols sections, nothing to do\n");
    - return 0;
    + err = 0;
    + goto out;
    }

    if (symbols_collect(&obj))
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 00:54    [W:4.025 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site