Commit 241a974b authored Jul 22, 2017 by Dan Carpenter Committed by David S. Miller Jul 24, 2017

bpf: dev_map_alloc() shouldn't return NULL



We forgot to set the error code on two error paths which means that we
return ERR_PTR(0) which is NULL.  The caller, find_and_alloc_map(), is
not expecting that and will have a NULL dereference.

Fixes: 546ac1ff ("bpf: add devmap, a map for storing net device references")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1bb79284

kernel/bpf/devmap.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -114,6 +114,7 @@ static struct bpf_map dev_map_alloc(union bpf_attr attr)
	if (err)		if (err)
	goto free_dtab;		goto free_dtab;

			err = -ENOMEM;
	/* A per cpu bitfield with a bit per possible net device */		/* A per cpu bitfield with a bit per possible net device */
	dtab->flush_needed = __alloc_percpu(		dtab->flush_needed = __alloc_percpu(
	BITS_TO_LONGS(attr->max_entries) *		BITS_TO_LONGS(attr->max_entries) *