diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-04-22 21:15:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-22 21:15:59 -0400 |
| commit | 986e54cd685e8166bc8b4f4c47de44709e541510 (patch) | |
| tree | f65c405a84425c608db7233819654e70f61d566a /kernel/bpf/sockmap.c | |
| parent | ibmvnic: Clean actual number of RX or TX pools (diff) | |
| parent | bpf: sockmap remove dead check (diff) | |
| download | linux-dev-986e54cd685e8166bc8b4f4c47de44709e541510.tar.xz linux-dev-986e54cd685e8166bc8b4f4c47de44709e541510.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-04-21
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix a deadlock between mm->mmap_sem and bpf_event_mutex when
one task is detaching a BPF prog via perf_event_detach_bpf_prog()
and another one dumping through bpf_prog_array_copy_info(). For
the latter we move the copy_to_user() out of the bpf_event_mutex
lock to fix it, from Yonghong.
2) Fix test_sock and test_sock_addr.sh failures. The former was
hitting rlimit issues and the latter required ping to specify
the address family, from Yonghong.
3) Remove a dead check in sockmap's sock_map_alloc(), from Jann.
4) Add generated files to BPF kselftests gitignore that were previously
missed, from Anders.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/sockmap.c')
| -rw-r--r-- | kernel/bpf/sockmap.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c index 8dd9210d7db7..a3b21385e947 100644 --- a/kernel/bpf/sockmap.c +++ b/kernel/bpf/sockmap.c @@ -1442,9 +1442,6 @@ static struct bpf_map *sock_map_alloc(union bpf_attr *attr) attr->value_size != 4 || attr->map_flags & ~SOCK_CREATE_FLAG_MASK) return ERR_PTR(-EINVAL); - if (attr->value_size > KMALLOC_MAX_SIZE) - return ERR_PTR(-E2BIG); - err = bpf_tcp_ulp_register(); if (err && err != -EEXIST) return ERR_PTR(err); |