Patch "arm64: bpf: fix out-of-bounds read in bpf2a64_offset()" has been added to the 4.1-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
arm64: bpf: fix out-of-bounds read in bpf2a64_offset()
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm64-bpf-fix-out-of-bounds-read-in-bpf2a64_offset.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
8eee539ddea09bccae2426f09b0ba6a18b72b691Mon Sep 17 00:00:00 2001
From: Xi Wang <[email protected]>
Date: Thu, 25 Jun 2015 05:47:39 -0700
Subject: arm64: bpf: fix out-of-bounds read in bpf2a64_offset()
From: Xi Wang <[email protected]>
commit 8eee539ddea09bccae2426f09b0ba6a18b72b691 upstream.
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.
--- arch/arm64/net/bpf_jit_comp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/arm64/net/bpf_jit_comp.c +4 -3
@@ -113,9 +113,9 @@ static inline void emit_a64_mov_i(conststatic inline int bpf2a64_offset (int bpf_to,int bpf_from,const struct jit_ctx *ctx) { -int to = ctx->offset[bpf_to +1 ]; +int to = ctx->offset[bpf_to];/* -1 to account for the Branch instruction */ -int from = ctx->offset[bpf_from +1 ] -1 ; +int from = ctx->offset[bpf_from] -1 ;return to - from; }
@@ -640,10 +640,11 @@ static int build_body(struct jit_ctx *ctconst struct bpf_insn *insn = &prog->insnsi[i];int ret; + ret =build_insn (insn, ctx); +if (ctx->image ==NULL ) ctx->offset[i] = ctx->idx; - ret =build_insn (insn, ctx);if (ret >0 ) { i++;continue ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/arm64-bpf-fix-endianness-conversion-bugs.patch queue-4.1/arm64-bpf-fix-out-of-bounds-read-in-bpf2a64_offset.patch