diff options
| author | Roman Gushchin <guro@fb.com> | 2019-05-30 03:03:59 +0200 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-06-01 01:52:56 +0200 |
| commit | c85d69135a9175c50a823d04d62d932312d037b3 (patch) | |
| tree | edd6ec707ebbf68a89fc1c3fc2b2d06364978ad3 /kernel/bpf/reuseport_array.c | |
| parent | bpf: rework memlock-based memory accounting for maps (diff) | |
| download | linux-c85d69135a9175c50a823d04d62d932312d037b3.tar.xz linux-c85d69135a9175c50a823d04d62d932312d037b3.zip | |
bpf: move memory size checks to bpf_map_charge_init()
Most bpf map types doing similar checks and bytes to pages
conversion during memory allocation and charging.
Let's unify these checks by moving them into bpf_map_charge_init().
Signed-off-by: Roman Gushchin <guro@fb.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/bpf/reuseport_array.c')
| -rw-r--r-- | kernel/bpf/reuseport_array.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/kernel/bpf/reuseport_array.c b/kernel/bpf/reuseport_array.c index 5c6e25b1b9b1..50c083ba978c 100644 --- a/kernel/bpf/reuseport_array.c +++ b/kernel/bpf/reuseport_array.c @@ -152,7 +152,7 @@ static struct bpf_map *reuseport_array_alloc(union bpf_attr *attr) int err, numa_node = bpf_map_attr_numa_node(attr); struct reuseport_array *array; struct bpf_map_memory mem; - u64 cost, array_size; + u64 array_size; if (!capable(CAP_SYS_ADMIN)) return ERR_PTR(-EPERM); @@ -160,13 +160,7 @@ static struct bpf_map *reuseport_array_alloc(union bpf_attr *attr) array_size = sizeof(*array); array_size += (u64)attr->max_entries * sizeof(struct sock *); - /* make sure there is no u32 overflow later in round_up() */ - cost = array_size; - if (cost >= U32_MAX - PAGE_SIZE) - return ERR_PTR(-ENOMEM); - cost = round_up(cost, PAGE_SIZE) >> PAGE_SHIFT; - - err = bpf_map_charge_init(&mem, cost); + err = bpf_map_charge_init(&mem, array_size); if (err) return ERR_PTR(err); |