diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-07-22 10:40:04 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-24 16:23:05 -0700 |
| commit | 241a974ba2c0d98e2104012cb80ed4494c0e66a7 (patch) | |
| tree | d1d8b6991207bebdf313268c343a39cda77ae1d8 /kernel/bpf/devmap.c | |
| parent | 1bb79284fcf9ebacff16ea0b81b3d5b86528cfd4 (diff) | |
| download | blackbird-op-linux-241a974ba2c0d98e2104012cb80ed4494c0e66a7.tar.gz blackbird-op-linux-241a974ba2c0d98e2104012cb80ed4494c0e66a7.zip | |
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.c | 1 |
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) 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) * |
