sparc64: Fix BPF JIT wrt. branches and ldimm64 instructions.
Like other JITs, sparc64 maintains an array of instruction offsets but stores the entries off by one. This is done because jumps to the exit block are indexed to one past the last BPF instruction. So if we size the array by the program length, we need to record the previous instruction in order to stay within the array bounds. This is explained in ARM JIT commit8eee539dde
("arm64: bpf: fix out-of-bounds read in bpf2a64_offset()"). But this scheme requires a little bit of careful handling when the instruction before the branch destination is a 64-bit load immediate. It takes up 2 BPF instruction slots. Therefore, we have to fill in the array entry for the second half of the 64-bit load immediate instruction rather than for the one for the beginning of that instruction. Fixes:7a12b5031c
("sparc64: Add eBPF JIT.") Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
48e75b4306
Коммит
e3bf4c61da
|
@ -1446,12 +1446,13 @@ static int build_body(struct jit_ctx *ctx)
|
|||
int ret;
|
||||
|
||||
ret = build_insn(insn, ctx);
|
||||
ctx->offset[i] = ctx->idx;
|
||||
|
||||
if (ret > 0) {
|
||||
i++;
|
||||
ctx->offset[i] = ctx->idx;
|
||||
continue;
|
||||
}
|
||||
ctx->offset[i] = ctx->idx;
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче