diff options
| author |   Andrii Nakryiko <andrii@kernel.org> | 2024-09-11 13:22:23 -0700 |
|---|---|---|
| committer | Andrii Nakryiko <andrii@kernel.org> | 2024-09-11 13:22:49 -0700 |
| commit | 2bea33f907a0185b3341075d764ab5f45334e0cc (patch) | |
| tree | d49ce4a5901ac2efc0ab066deacfbb68666374de /kernel | |
| parent | bpf: lsm: Set bpf_lsm_blob_sizes.lbs_task to 0 (diff) | |
| parent | bpf/selftests: Check errno when percpu map value size exceeds (diff) | |
| download | linux-rng-2bea33f907a0185b3341075d764ab5f45334e0cc.tar.xz linux-rng-2bea33f907a0185b3341075d764ab5f45334e0cc.zip | |
Merge branch 'bpf-add-percpu-map-value-size-check'
Tao Chen says:
====================
bpf: Add percpu map value size check
Check percpu map value size first and add the test case in selftest.
Change list:
- v2 -> v3:
- use bpf_map_create API and mv test case in map_percpu_stats.c
- v1 -> v2:
- round up map value size with 8 bytes in patch 1
- add selftest case in patch 2
====================
Link: https://lore.kernel.org/r/20240910144111.1464912-1-chen.dylane@gmail.com
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/arraymap.c | 3 | ||||
| -rw-r--r-- | kernel/bpf/hashtab.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index a43e62e2a8bb..79660e3fca4c 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -73,6 +73,9 @@ int array_map_alloc_check(union bpf_attr *attr) /* avoid overflow on round_up(map->value_size) */ if (attr->value_size > INT_MAX) return -E2BIG; + /* percpu map value size is bound by PCPU_MIN_UNIT_SIZE */ + if (percpu && round_up(attr->value_size, 8) > PCPU_MIN_UNIT_SIZE) + return -E2BIG; return 0; } diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index 45c7195b65ba..b14b87463ee0 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -462,6 +462,9 @@ static int htab_map_alloc_check(union bpf_attr *attr) * kmalloc-able later in htab_map_update_elem() */ return -E2BIG; + /* percpu map value size is bound by PCPU_MIN_UNIT_SIZE */ + if (percpu && round_up(attr->value_size, 8) > PCPU_MIN_UNIT_SIZE) + return -E2BIG; return 0; } |