diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-08-25 22:27:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-29 00:23:34 +0200 |
| commit | f740c34ee5cf62e1fff5ebec6d0e63efcc3cdfe9 (patch) | |
| tree | dae07d94d1213f22effa1425da4a05e286dd56ea /kernel/bpf | |
| parent | net: Add comment that early_demux can change via sysctl (diff) | |
| download | linux-f740c34ee5cf62e1fff5ebec6d0e63efcc3cdfe9.tar.xz linux-f740c34ee5cf62e1fff5ebec6d0e63efcc3cdfe9.zip | |
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: 174a79ff9515 ("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>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/sockmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c index bcc326a2e5ce..db0d99d2fe18 100644 --- a/kernel/bpf/sockmap.c +++ b/kernel/bpf/sockmap.c @@ -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); |