diff options
| author | Ravi Bangoria <ravi.bangoria@linux.ibm.com> | 2021-06-22 16:30:26 +0530 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2021-06-28 15:11:43 +0200 |
| commit | 328aac5ecd119ede3633f7d17969b1ff34ccc784 (patch) | |
| tree | b927e9dcc360dc260d50e1b5797a55563ee18070 /arch/x86/net/bpf_jit_comp.c | |
| parent | a196fa78a26571359740f701cf30d774eb8a72cb (diff) | |
| download | linux-328aac5ecd119ede3633f7d17969b1ff34ccc784.tar.bz2 | |
bpf, x86: Fix extable offset calculation
Commit 4c5de127598e1 ("bpf: Emit explicit NULL pointer checks for PROBE_LDX
instructions.") is emitting a couple of instructions before the actual load.
Consider those additional instructions while calculating extable offset.
Fixes: 4c5de127598e1 ("bpf: Emit explicit NULL pointer checks for PROBE_LDX instructions.")
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20210622110026.1157847-1-ravi.bangoria@linux.ibm.com
Diffstat (limited to 'arch/x86/net/bpf_jit_comp.c')
| -rw-r--r-- | arch/x86/net/bpf_jit_comp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index db1e83813db5..e835164189f1 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -1281,7 +1281,7 @@ st: if (is_imm8(insn->off)) emit_ldx(&prog, BPF_SIZE(insn->code), dst_reg, src_reg, insn->off); if (BPF_MODE(insn->code) == BPF_PROBE_MEM) { struct exception_table_entry *ex; - u8 *_insn = image + proglen; + u8 *_insn = image + proglen + (start_of_ldx - temp); s64 delta; /* populate jmp_offset for JMP above */ |