Commit 8833bc30 authored Jun 04, 2015 by Markos Chandras Committed by Ralf Baechle Jun 06, 2015

MIPS: BPF: Fix stack pointer allocation



Fix stack pointer offset which could potentially corrupt
argument registers in the previous frame. The calculated offset
reflects the size of all the registers we need to preserve so there
is no need for this erroneous subtraction.

[ralf@linux-mips.org: Fixed conflict due to only applying this fix part
of the entire series as part of 4.1 fixes.]

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Daniel Borkmann <dborkman@redhat.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/10527/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent e1fb96e0

arch/mips/net/bpf_jit.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -681,11 +681,7 @@ static unsigned int get_stack_depth(struct jit_ctx *ctx)
		sp_off += config_enabled(CONFIG_64BIT) ?
		(ARGS_USED_BY_JIT + 1) * RSIZE : RSIZE;

		/*
		* Subtract the bytes for the last registers since we only care about
		* the location on the stack pointer.
		*/
		return sp_off - RSIZE;
		return sp_off;
		}

		static void build_prologue(struct jit_ctx *ctx)