Commit 823707b6 authored Mar 07, 2016 by Alexei Starovoitov Committed by David S. Miller Mar 08, 2016

bpf: check for reserved flag bits in array and stack maps



Suggested-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6c905981

kernel/bpf/arraymap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ static struct bpf_map array_map_alloc(union bpf_attr attr)

		/* check sanity of attributes */
		if (attr->max_entries == 0 \|\| attr->key_size != 4 \|\|
		attr->value_size == 0)
		attr->value_size == 0 \|\| attr->map_flags)
		return ERR_PTR(-EINVAL);

		if (attr->value_size >= 1 << (KMALLOC_SHIFT_MAX - 1))

kernel/bpf/stackmap.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,9 @@ static struct bpf_map stack_map_alloc(union bpf_attr attr)
		if (!capable(CAP_SYS_ADMIN))
		return ERR_PTR(-EPERM);

		if (attr->map_flags)
		return ERR_PTR(-EINVAL);

		/* check sanity of attributes */
		if (attr->max_entries == 0 \|\| attr->key_size != 4 \|\|
		value_size < 8 \|\| value_size % 8 \|\|