projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3229338
)
libbpf: Fix memory leak in btf__dedup()
author
Mauricio Vásquez
<mauricio@kinvolk.io>
Fri, 22 Oct 2021 20:20:35 +0000
(15:20 -0500)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 18 Nov 2021 18:16:39 +0000
(19:16 +0100)
[ Upstream commit
1000298c76830bc291358e98e8fa5baa3baa9b3a
]
Free btf_dedup if btf_ensure_modifiable() returns error.
Fixes: 919d2b1dbb07 ("libbpf: Allow modification of BTF and add btf__add_str API")
Signed-off-by: Mauricio Vásquez <mauricio@kinvolk.io>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link:
https://lore.kernel.org/bpf/20211022202035.48868-1-mauricio@kinvolk.io
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/lib/bpf/btf.c
patch
|
blob
|
history
diff --git
a/tools/lib/bpf/btf.c
b/tools/lib/bpf/btf.c
index 77dc24d58302dc2f26d8860a76f0f888d65936a6..bf8c8676d68e5afa471c6f03e5587496081e21ad 100644
(file)
--- a/
tools/lib/bpf/btf.c
+++ b/
tools/lib/bpf/btf.c
@@
-2914,8
+2914,10
@@
int btf__dedup(struct btf *btf, struct btf_ext *btf_ext,
return libbpf_err(-EINVAL);
}
- if (btf_ensure_modifiable(btf))
- return libbpf_err(-ENOMEM);
+ if (btf_ensure_modifiable(btf)) {
+ err = -ENOMEM;
+ goto done;
+ }
err = btf_dedup_prep(d);
if (err) {