bpf: Fix verifier log for async callback return values
Subsystems (4)
PATCH 1/2 bpf: Fix verifier log for async callback return values
The verifier, as part of check_return_code(), verifies that async callbacks such as from e.g. timers, will return 0. It does this by correctly checking that R0->var_off is in tnum_const(0), which effectively checks that it's in a range of 0. If this condition fails, however, it prints an error message which says that the value should have been in (0x0; 0x1). This results in possibly confusing output such as the following in which an async callback returns 1:
At async callback the register R0 has value (0x1; 0x0) should have been in (0x0; 0x1)
The fix is easy -- we should just pass the tnum_const(0) as the correct range to verbose_invalid_scalar(), which will then print the following:
At async callback the register R0 has value (0x1; 0x0) should have been in (0x0; 0x0)
--- kernel/bpf/verifier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/verifier.c +3 -3
@@ -14729,7 +14729,7 @@ static int check_return_code(struct bpf_verifier_env *env, int regno)struct tnum enforce_attach_type_range = tnum_unknown;const struct bpf_prog *prog = env->prog;struct bpf_reg_state *reg; -struct tnum range =tnum_range (0 ,1 ); +struct tnum range =tnum_range (0 ,1 ), const_0 =tnum_const (0 );enum bpf_prog_type prog_type =resolve_prog_type (env->prog);int err;struct bpf_func_state *frame = env->cur_state->frame[0 ];
@@ -14777,8 +14777,8 @@ static int check_return_code(struct bpf_verifier_env *env, int regno)return -EINVAL ; } -if (!tnum_in (tnum_const (0 ), reg->var_off)) { -verbose_invalid_scalar (env, reg, &range,"async callback" ,"R0" ); +if (!tnum_in (const_0, reg->var_off)) { +verbose_invalid_scalar (env, reg, &const_0,"async callback" ,"R0" );return -EINVAL ; }return 0 ;
Signature · 1 line
2.41.0
PATCH 2/2 bpf/selftests: Add testcase for async callback return value failure
A previous commit updated the verifier to print an accurate failure message for when someone specifies a nonzero return value from an async callback. This adds a testcase for validating that the verifier emits the correct message in such a case.
--- .../testing/selftests/bpf/prog_tests/timer.c | 6 ++- .../selftests/bpf/progs/timer_failure.c | 47 +++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/timer_failure.c
tools/testing/selftests/bpf/prog_tests/timer.c +4 -2
@@ -2,6 +2,7 @@/* Copyright (c) 2021 Facebook */ #include <test_progs.h> #include "timer.skel.h" +#include "timer_failure.skel.h" static int timer (struct timer *timer_skel) {
@@ -53,10 +54,11 @@ void serial_test_timer(void) timer_skel =timer__open_and_load ();if (!ASSERT_OK_PTR (timer_skel,"timer_skel_load" )) - goto cleanup; +return ; err =timer (timer_skel);ASSERT_OK (err,"timer" ); -cleanup:timer__destroy (timer_skel); + +RUN_TESTS (timer_failure); }
tools/testing/selftests/bpf/progs/timer_failure.c new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.41.0
This series was applied to bpf/bpf.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This series was applied to bpf/bpf.git (master)
by Daniel Borkmann <[email protected]>:
Quoted 9 lines · On Mon, 9 Oct 2023 11:14:13 -0500 you wrote:
The verifier, as part of
check_return_code(), verifies that async callbacks such as from e.g. timers, will return 0. It does this by correctly checking thatR0->var_offis intnum_const(0), which effectively checks that it's in a range of 0. If this condition fails, however, it prints an error message which says that the value should have been in (0x0;0x1). This results in possibly confusing output such as the following in which an async callback returns 1:[...]
Here is the summary with links:
- [bpf-next,1/2] bpf: Fix verifier log for async callback return values
https://git.kernel.org/bpf/bpf/c/829955981c55 - [bpf-next,2/2] bpf/selftests: Add testcase for async callback return value failure https://git.kernel.org/bpf/bpf/c/57ddeb86b311
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html