Commit f740c34e authored Aug 25, 2017 by Dan Carpenter Committed by David S. Miller Aug 28, 2017

bpf: fix oops on allocation failure



"err" is set to zero if bpf_map_area_alloc() fails so it means we return
ERR_PTR(0) which is NULL.  The caller, find_and_alloc_map(), is not
expecting NULL returns and will oops.

Fixes: 174a79ff ("bpf: sockmap with sk redirect support")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a8e3bb34

kernel/bpf/sockmap.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -523,6 +523,7 @@ static struct bpf_map sock_map_alloc(union bpf_attr attr)
		if (err)
		goto free_stab;

		err = -ENOMEM;
		stab->sock_map = bpf_map_area_alloc(stab->map.max_entries *
		sizeof(struct sock *),
		stab->map.numa_node);

Admin message