diff options
| author | Maxim Mikityanskiy <maxtram95@gmail.com> | 2024-09-09 16:39:09 +0300 |
|---|---|---|
| committer | Andrii Nakryiko <andrii@kernel.org> | 2024-09-09 15:58:17 -0700 |
| commit | bee109b7b3e50739b88252a219fa07ecd78ad628 (patch) | |
| tree | deddf35e7e450e37bf4658bb000be9a9baa38452 /kernel/bpf | |
| parent | f028d7716cdeae3be7d8d211482248916b25b1c2 (diff) | |
| download | linux-bee109b7b3e50739b88252a219fa07ecd78ad628.tar.gz linux-bee109b7b3e50739b88252a219fa07ecd78ad628.tar.bz2 linux-bee109b7b3e50739b88252a219fa07ecd78ad628.zip | |
bpf: Fix error message on kfunc arg type mismatch
When "arg#%d expected pointer to ctx, but got %s" error is printed, both
template parts actually point to the type of the argument, therefore, it
will also say "but got PTR", regardless of what was the actual register
type.
Fix the message to print the register type in the second part of the
template, change the existing test to adapt to the new format, and add a
new test to test the case when arg is a pointer to context, but reg is a
scalar.
Fixes: 00b85860feb8 ("bpf: Rewrite kfunc argument handling")
Signed-off-by: Maxim Mikityanskiy <maxim@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/bpf/20240909133909.1315460-1-maxim@isovalent.com
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/verifier.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 53d0556fbbf3..f35b80c16cda 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -12132,7 +12132,8 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_ switch (kf_arg_type) { case KF_ARG_PTR_TO_CTX: if (reg->type != PTR_TO_CTX) { - verbose(env, "arg#%d expected pointer to ctx, but got %s\n", i, btf_type_str(t)); + verbose(env, "arg#%d expected pointer to ctx, but got %s\n", + i, reg_type_str(env, reg->type)); return -EINVAL; } |