diff options
| author | Benjamin Tissoires <bentiss@kernel.org> | 2024-04-20 12:09:07 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2024-04-24 04:31:24 +0300 |
| commit | ad2c03e691be3268eefc75ff1d892db3f0e79f62 (patch) | |
| tree | 915aecb9964c714c552cd7b37c765e0eb053858c /kernel/bpf | |
| parent | f1d0a2fbb0088675cceeab73d1f4b4308b289984 (diff) | |
| download | linux-ad2c03e691be3268eefc75ff1d892db3f0e79f62.tar.xz | |
bpf: verifier: bail out if the argument is not a map
When a kfunc is declared with a KF_ARG_PTR_TO_MAP, we should have
reg->map_ptr set to a non NULL value, otherwise, that means that the
underlying type is not a map.
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
Link: https://lore.kernel.org/r/20240420-bpf_wq-v2-7-6c986a5a741f@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/verifier.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 89490a95b120..4adf7fc33e5a 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -11720,6 +11720,11 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_ case KF_ARG_PTR_TO_NULL: continue; case KF_ARG_PTR_TO_MAP: + if (!reg->map_ptr) { + verbose(env, "pointer in R%d isn't map pointer\n", regno); + return -EINVAL; + } + fallthrough; case KF_ARG_PTR_TO_ALLOC_BTF_ID: case KF_ARG_PTR_TO_BTF_ID: if (!is_kfunc_trusted_args(meta) && !is_kfunc_rcu(meta)) |