Date: Thu, 25 Jun 2015 15:26:29 +0100
From: Catalin Marinas <catalin.marinas@arm.com>
To: Xi Wang <xi.wang@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org, Zi Shen Lim <zlim.lnx@gmail.com>,
        Will Deacon <will.deacon@arm.com>, linux-kernel@vger.kernel.org,
        Alexei Starovoitov <ast@plumgrid.com>
Subject: Re: [PATCH] arm64: bpf: fix out-of-bounds read in bpf2a64_offset()
Message-ID: <20150625142628.GA10127@e104818-lin.cambridge.arm.com>
References: <1435236459-15141-1-git-send-email-xi.wang@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1435236459-15141-1-git-send-email-xi.wang@gmail.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1026
Lines: 25

On Thu, Jun 25, 2015 at 05:47:39AM -0700, Xi Wang wrote:
> 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.
> 
> Cc: Zi Shen Lim <zlim.lnx@gmail.com>
> Cc: Alexei Starovoitov <ast@plumgrid.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Fixes: e54bcde3d69d ("arm64: eBPF JIT compiler")
> Signed-off-by: Xi Wang <xi.wang@gmail.com>

Thanks. Applied.

-- 
Catalin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/