mirror/libbpf
1
0
Fork 0
mirror of https://github.com/netdata/libbpf.git synced 2026-04-08 01:29:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

libbpf: Fix memory leak/double free issue

Browse Source 
Coverity scan against Github libbpf code found the issue of not freeing memory and
leaving already freed memory still referenced from bpf_program. Fix it by
re-assigning successfully reallocated memory sooner.

Fixes: 2993e0515bb4 ("tools/bpf: add support to read .BTF.ext sections")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20191107020855.3834758-2-andriin@fb.com
This commit is contained in:
Andrii Nakryiko
2019-11-06 18:08:51 -08:00
committed by Andrii Nakryiko
parent 2ef7f5607c
commit 330f4683e2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libbpf.c
View File

@@ -3523,6 +3523,7 @@ bpf_program__reloc_text(struct bpf_program *prog, struct bpf_object *obj,
pr_warn("oom in prog realloc\n"); pr_warn("oom in prog realloc\n");
return -ENOMEM; return -ENOMEM;
} }
prog->insns = new_insn;
if (obj->btf_ext) { if (obj->btf_ext) {
err = bpf_program_reloc_btf_ext(prog, obj, err = bpf_program_reloc_btf_ext(prog, obj,
@@ -3534,7 +3535,6 @@ bpf_program__reloc_text(struct bpf_program *prog, struct bpf_object *obj,
memcpy(new_insn + prog->insns_cnt, text->insns, memcpy(new_insn + prog->insns_cnt, text->insns,
text->insns_cnt * sizeof(*insn)); text->insns_cnt * sizeof(*insn));
prog->insns = new_insn;
prog->main_prog_cnt = prog->insns_cnt; prog->main_prog_cnt = prog->insns_cnt;
prog->insns_cnt = new_cnt; prog->insns_cnt = new_cnt;
pr_debug("added %zd insn from %s to prog %s\n", pr_debug("added %zd insn from %s to prog %s\n",