riscv: bpf: Fix eBPF's exception tables
authorJisheng Zhang <jszhang@kernel.org>
Mon, 10 Jan 2022 16:52:08 +0000 (00:52 +0800)
committerPalmer Dabbelt <palmer@rivosinc.com>
Wed, 19 Jan 2022 18:50:02 +0000 (10:50 -0800)
eBPF's exception tables needs to be modified to relative synchronously.

Suggested-by: Tong Tiangen <tongtiangen@huawei.com>
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Fixes: 1f77ed9422cb ("riscv: switch to relative extable and other improvements")
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
arch/riscv/net/bpf_jit_comp64.c

index 293dd6e..0bcda99 100644 (file)
@@ -497,7 +497,7 @@ static int add_exception_handler(const struct bpf_insn *insn,
        offset = pc - (long)&ex->insn;
        if (WARN_ON_ONCE(offset >= 0 || offset < INT_MIN))
                return -ERANGE;
-       ex->insn = pc;
+       ex->insn = offset;
 
        /*
         * Since the extable follows the program, the fixup offset is always