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

libbpf: Fix memory leak and optimize BTF sanitization

Browse Source 
Coverity's static analysis helpfully reported a memory leak introduced by
0f0e55d8247c ("libbpf: Improve BTF sanitization handling"). While fixing it,
I realized that btf__new() already creates a memory copy, so there is no need
to do this. So this patch also fixes misleading btf__new() signature to make
data into a `const void *` input parameter. And it avoids unnecessary memory
allocation and copy in BTF sanitization code altogether.

Fixes: 0f0e55d8247c ("libbpf: Improve BTF sanitization handling")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20200710011023.1655008-1-andriin@fb.com
This commit is contained in:
Andrii Nakryiko
2020-07-09 18:10:23 -07:00
committed by Andrii Nakryiko
parent 8b5e81a17a
commit 5255eb2799
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/btf.c
View File

@@ -397,7 +397,7 @@ void btf__free(struct btf *btf)
free(btf); free(btf);
} }
struct btf *btf__new(__u8 *data, __u32 size) struct btf *btf__new(const void *data, __u32 size)
{ {
struct btf *btf; struct btf *btf;
int err; int err;

2
src/btf.h
View File

@@ -63,7 +63,7 @@ struct btf_ext_header {
}; };
LIBBPF_API void btf__free(struct btf *btf); LIBBPF_API void btf__free(struct btf *btf);
LIBBPF_API struct btf *btf__new(__u8 *data, __u32 size); LIBBPF_API struct btf *btf__new(const void *data, __u32 size);
LIBBPF_API struct btf *btf__parse_elf(const char *path, LIBBPF_API struct btf *btf__parse_elf(const char *path,
struct btf_ext **btf_ext); struct btf_ext **btf_ext);
LIBBPF_API int btf__finalize_data(struct bpf_object *obj, struct btf *btf); LIBBPF_API int btf__finalize_data(struct bpf_object *obj, struct btf *btf);

11
src/libbpf.c
View File

@@ -2533,17 +2533,12 @@ static int bpf_object__sanitize_and_load_btf(struct bpf_object *obj)
sanitize = btf_needs_sanitization(obj); sanitize = btf_needs_sanitization(obj);
if (sanitize) { if (sanitize) {
const void *orig_data; const void *raw_data;
void *san_data;
__u32 sz; __u32 sz;
/* clone BTF to sanitize a copy and leave the original intact */ /* clone BTF to sanitize a copy and leave the original intact */
orig_data = btf__get_raw_data(obj->btf, &sz); raw_data = btf__get_raw_data(obj->btf, &sz);
san_data = malloc(sz); kern_btf = btf__new(raw_data, sz);
if (!san_data)
return -ENOMEM;
memcpy(san_data, orig_data, sz);
kern_btf = btf__new(san_data, sz);
if (IS_ERR(kern_btf)) if (IS_ERR(kern_btf))
return PTR_ERR(kern_btf); return PTR_ERR(kern_btf);