projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1bd12b7
)
tools/resolve_btf_ids: Close ELF file on error
author
Andrii Nakryiko
<andrii@kernel.org>
Wed, 24 Nov 2021 00:23:13 +0000
(16:23 -0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 8 Mar 2022 18:12:33 +0000
(19:12 +0100)
[ 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
patch
|
blob
|
history
diff --git
a/tools/bpf/resolve_btfids/main.c
b/tools/bpf/resolve_btfids/main.c
index de6365b53c9ca0d9d1015ddaebb0b724ee2dc176..45e0d640618acc4307d0f296c1e3bd403c9ba2c2 100644
(file)
--- a/
tools/bpf/resolve_btfids/main.c
+++ b/
tools/bpf/resolve_btfids/main.c
@@
-166,7
+166,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;
@@
-720,7
+720,8
@@
int main(int argc, const char **argv)
if (no_fail)
return 0;
pr_err("FAILED to find needed sections\n");
- return -1;
+ err = 0;
+ goto out;
}
if (symbols_collect(&obj))