aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/bpf/devmap.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-07-22 03:40:04 -0400
committerDavid S. Miller <davem@davemloft.net>2017-07-24 19:23:05 -0400
commit241a974ba2c0d98e2104012cb80ed4494c0e66a7 (patch)
treed1d8b6991207bebdf313268c343a39cda77ae1d8 /kernel/bpf/devmap.c
parent1bb79284fcf9ebacff16ea0b81b3d5b86528cfd4 (diff)
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: 546ac1ffb70d ("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>
Diffstat (limited to 'kernel/bpf/devmap.c')
-rw-r--r--kernel/bpf/devmap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index 899364d097f5..d439ee0eadb1 100644
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -114,6 +114,7 @@ static struct bpf_map *dev_map_alloc(union bpf_attr *attr)
114 if (err) 114 if (err)
115 goto free_dtab; 115 goto free_dtab;
116 116
117 err = -ENOMEM;
117 /* A per cpu bitfield with a bit per possible net device */ 118 /* A per cpu bitfield with a bit per possible net device */
118 dtab->flush_needed = __alloc_percpu( 119 dtab->flush_needed = __alloc_percpu(
119 BITS_TO_LONGS(attr->max_entries) * 120 BITS_TO_LONGS(attr->max_entries) *