Commit 0fa96355 authored May 12, 2016 by Michael Holzheu Committed by Martin Schwidefsky May 19, 2016

s390/bpf: reduce maximum program size to 64 KB



The s390 BFP compiler currently uses relative branch instructions
that only support jumps up to 64 KB. Examples are "j", "jnz", "cgrj",
etc.  Currently the maximum size of s390 BPF programs is set
to 0x7ffff.  If branches over 64 KB are generated the, kernel can
crash due to incorrect code.

So fix this an reduce the maximum size to 64 KB. Programs larger than
that will be interpreted.

Fixes: ce2b6ad9 ("s390/bpf: increase BPF_SIZE_MAX")

Cc: stable@vger.kernel.org # 4.3+
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent 2600a46e

arch/s390/net/bpf_jit_comp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ struct bpf_jit {
		int labels[1]; /* Labels for local jumps */
		};

		#define BPF_SIZE_MAX 0x7ffff /* Max size for program (20 bit signed displ) */
		#define BPF_SIZE_MAX 0xffff /* Max size for program (16 bit branches) */

		#define SEEN_SKB 1 /* skb access */
		#define SEEN_MEM 2 /* use mem[] for temporary storage */