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>

1 files changed, 1 insertions, 7 deletions

diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
index 3552da4407d9..0349cbf23cdb 100644
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -117,14 +117,8 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr)
 
         /* make sure there is no u32 overflow later in round_up() */
         cost = array_size;
-        if (cost >= U32_MAX - PAGE_SIZE)
-                return ERR_PTR(-ENOMEM);
-        if (percpu) {
+        if (percpu)
                 cost += (u64)attr->max_entries * elem_size * num_possible_cpus();
-                if (cost >= U32_MAX - PAGE_SIZE)
-                        return ERR_PTR(-ENOMEM);
-        }
-        cost = round_up(cost, PAGE_SIZE) >> PAGE_SHIFT;
 
         ret = bpf_map_charge_init(&mem, cost);
         if (ret < 0)