| Message ID | 20180420161630.233178-1-jannh@google.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [net] bpf: sockmap remove dead check | expand |
On 04/20/2018 06:16 PM, Jann Horn wrote: > Remove dead code that bails on `attr->value_size > KMALLOC_MAX_SIZE` - the > previous check already bails on `attr->value_size != 4`. > > Signed-off-by: Jann Horn <jannh@google.com> Applied to bpf tree, thanks Jann!
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);
Remove dead code that bails on `attr->value_size > KMALLOC_MAX_SIZE` - the previous check already bails on `attr->value_size != 4`. Signed-off-by: Jann Horn <jannh@google.com> --- kernel/bpf/sockmap.c | 3 --- 1 file changed, 3 deletions(-)