bpf: dev_map_alloc() shouldn't return NULL
authorDan Carpenter <dan.carpenter@oracle.com>
Sat, 22 Jul 2017 07:40:04 +0000 (10:40 +0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Jul 2017 23:23:05 +0000 (16:23 -0700)
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>
kernel/bpf/devmap.c

index 899364d097f5b2330f46cad83b5416ad80a729ca..d439ee0eadb19e4c98d66c47c029acebaecdd606 100644 (file)
@@ -114,6 +114,7 @@ static struct bpf_map *dev_map_alloc(union bpf_attr *attr)
        if (err)
                goto free_dtab;
 
+       err = -ENOMEM;
        /* A per cpu bitfield with a bit per possible net device */
        dtab->flush_needed = __alloc_percpu(
                                BITS_TO_LONGS(attr->max_entries) *