arm64: bpf: fix out-of-bounds read in bpf2a64_offset()
authorXi Wang <xi.wang@gmail.com>
Thu, 25 Jun 2015 12:47:39 +0000 (05:47 -0700)
committerCatalin Marinas <catalin.marinas@arm.com>
Thu, 25 Jun 2015 13:50:43 +0000 (14:50 +0100)
commit8eee539ddea09bccae2426f09b0ba6a18b72b691
treed72b62bd07f1e0479edc69a0a25860acf5d58bf7
parentbe081d9bf3e163a9ed1ca2f0f14f08424c7f9016
arm64: bpf: fix out-of-bounds read in bpf2a64_offset()

Problems occur when bpf_to or bpf_from has value prog->len - 1 (e.g.,
"Very long jump backwards" in test_bpf where the last instruction is a
jump): since ctx->offset has length prog->len, ctx->offset[bpf_to + 1]
or ctx->offset[bpf_from + 1] will cause an out-of-bounds read, leading
to a bogus jump offset and kernel panic.

This patch moves updating ctx->offset to after calling build_insn(),
and changes indexing to use bpf_to and bpf_from without + 1.

Fixes: e54bcde3d69d ("arm64: eBPF JIT compiler")
Cc: <stable@vger.kernel.org> # 3.18+
Cc: Zi Shen Lim <zlim.lnx@gmail.com>
Cc: Will Deacon <will.deacon@arm.com>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/net/bpf_jit_comp.c