diff options
| author | Philo Lu <lulie@linux.alibaba.com> | 2024-04-05 04:55:35 +0200 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2024-04-05 19:31:17 +0200 |
| commit | 9d482da9e17a4ddd5563428f74302a36b2610306 (patch) | |
| tree | daa373372a1c4edf856de49c047898273a7141f5 /kernel/bpf | |
| parent | bpf: store both map ptr and state in bpf_insn_aux_data (diff) | |
| download | linux-9d482da9e17a4ddd5563428f74302a36b2610306.tar.xz linux-9d482da9e17a4ddd5563428f74302a36b2610306.zip | |
bpf: allow invoking bpf_for_each_map_elem with different maps
Taking different maps within a single bpf_for_each_map_elem call is not
allowed before, because from the second map,
bpf_insn_aux_data->map_ptr_state will be marked as *poison*. In fact
both map_ptr and state are needed to support this use case: map_ptr is
used by set_map_elem_callback_state() while poison state is needed to
determine whether to use direct call.
Signed-off-by: Philo Lu <lulie@linux.alibaba.com>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/r/20240405025536.18113-3-lulie@linux.alibaba.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/verifier.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 62fedb1f3312..590db4e4c071 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -9651,11 +9651,7 @@ static int set_map_elem_callback_state(struct bpf_verifier_env *env, struct bpf_map *map; int err; - if (bpf_map_ptr_poisoned(insn_aux)) { - verbose(env, "tail_call abusing map_ptr\n"); - return -EINVAL; - } - + /* valid map_ptr and poison value does not matter */ map = insn_aux->map_ptr_state.map_ptr; if (!map->ops->map_set_for_each_callback_args || !map->ops->map_for_each_callback) { |