diff options
| author |   Alexei Starovoitov <ast@kernel.org> | 2019-07-30 18:38:26 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-08-01 13:12:09 -0700 |
| commit | 7c2e988f400e83501e0a3568250780609b7c8263 (patch) | |
| tree | 38919cff1c1ef870322d43d8f05e15f048affb85 /tools/testing/selftests/bpf/verifier | |
| parent | libbpf: set BTF FD for prog only when there is supported .BTF.ext data (diff) | |
| download | linux-dev-7c2e988f400e83501e0a3568250780609b7c8263.tar.xz linux-dev-7c2e988f400e83501e0a3568250780609b7c8263.zip | |
bpf: fix x64 JIT code generation for jmp to 1st insn
Introduction of bounded loops exposed old bug in x64 JIT.
JIT maintains the array of offsets to the end of all instructions to
compute jmp offsets.
addrs[0] - offset of the end of the 1st insn (that includes prologue).
addrs[1] - offset of the end of the 2nd insn.
JIT didn't keep the offset of the beginning of the 1st insn,
since classic BPF didn't have backward jumps and valid extended BPF
couldn't have a branch to 1st insn, because it didn't allow loops.
With bounded loops it's possible to construct a valid program that
jumps backwards to the 1st insn.
Fix JIT by computing:
addrs[0] - offset of the end of prologue == start of the 1st insn.
addrs[1] - offset of the end of 1st insn.
v1->v2:
- Yonghong noticed a bug in jit linfo.
Fix it by passing 'addrs + 1' to bpf_prog_fill_jited_linfo(),
since it expects insn_to_jit_off array to be offsets to last byte.
Reported-by: syzbot+35101610ff3e83119b1b@syzkaller.appspotmail.com
Fixes: 2589726d12a1 ("bpf: introduce bounded loops")
Fixes: 0a14842f5a3c ("net: filter: Just In Time compiler for x86-64")
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
Diffstat (limited to 'tools/testing/selftests/bpf/verifier')
0 files changed, 0 insertions, 0 deletions