UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

libbpf: fix detection of corrupted BPF instructions section 

Ensure that size of a section w/ BPF instruction is exactly a multiple
of BPF instruction size.

Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Andrii Nakryiko 2019-05-29 10:36:03 -07:00 committed by Daniel Borkmann
parent 501b125a29
commit 8ca990ce0d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/lib/bpf/libbpf.c
View File

@ -349,8 +349,11 @@ static int
bpf_program__init(void *data, size_t size, char *section_name, int idx, bpf_program__init(void *data, size_t size, char *section_name, int idx,
struct bpf_program *prog) struct bpf_program *prog)
{ {
if (size < sizeof(struct bpf_insn)) { const size_t bpf_insn_sz = sizeof(struct bpf_insn);
pr_warning("corrupted section '%s'\n", section_name);
if (size == 0 || size % bpf_insn_sz) {
pr_warning("corrupted section '%s', size: %zu\n",
section_name, size);
return -EINVAL; return -EINVAL;
} }
@ -376,9 +379,8 @@ bpf_program__init(void *data, size_t size, char *section_name, int idx,
section_name); section_name);
goto errout; goto errout;
} }
prog->insns_cnt = size / sizeof(struct bpf_insn); prog->insns_cnt = size / bpf_insn_sz;
memcpy(prog->insns, data, memcpy(prog->insns, data, size);
prog->insns_cnt * sizeof(struct bpf_insn));
prog->idx = idx; prog->idx = idx;
prog->instances.fds = NULL; prog->instances.fds = NULL;
prog->instances.nr = -1; prog->instances.nr = -1;