diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-02-01 10:19:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-02-01 10:19:35 +0100 |
| commit | 1055e0ba568b2ab03de384b70947cd41d2c6ad82 (patch) | |
| tree | aaa60456cdb2e510fa92582e0a5a2d0556630e8a /kernel/bpf/arraymap.c | |
| parent | e2e2eabb68dfd00502bf8501b015862eb8b3f392 (diff) | |
| parent | 0becc0ae5b42828785b589f686725ff5bc3b9b25 (diff) | |
Merge branch 'x86/urgent' into x86/platform, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/bpf/arraymap.c')
| -rw-r--r-- | kernel/bpf/arraymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index a2ac051c342f..229a5d5df977 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -56,7 +56,7 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr) attr->value_size == 0 || attr->map_flags) return ERR_PTR(-EINVAL); - if (attr->value_size >= 1 << (KMALLOC_SHIFT_MAX - 1)) + if (attr->value_size > KMALLOC_MAX_SIZE) /* if value_size is bigger, the user space won't be able to * access the elements. */ |