bpf: Zero index arg error string for dynptr and iter

Browse source

[ Upstream commit bd74e238ae ]

Andrii spotted that process_dynptr_func's rejection of incorrect
argument register type will print an error string where argument numbers
are not zero-indexed, unlike elsewhere in the verifier.  Fix this by
subtracting 1 from regno. The same scenario exists for iterator
messages. Fix selftest error strings that match on the exact argument
number while we're at it to ensure clean bisection.

Suggested-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20241203002235.3776418-1-memxor@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

...

This commit is contained in:

Kumar Kartikeya Dwivedi 2024-12-02 16:22:35 -08:00 • committed by Greg Kroah-Hartman

parent a089dad6f9

commit fdaaf92943

6 changed files with 29 additions and 29 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

kernel/bpf/verifier.c

View file

22

tools/testing/selftests/bpf/progs/dynptr_fail.c

View file

14

tools/testing/selftests/bpf/progs/iters_state_safety.c

View file

4

tools/testing/selftests/bpf/progs/iters_testmod_seq.c

View file

2

tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c

View file

4

tools/testing/selftests/bpf/progs/verifier_bits_iter.c

View file