bpf: Allow reads from uninit stack
PATCH 1/1 bpf: Allow reads from uninit stack
From: Eduard Zingerman <[email protected]>
[ Upstream commit 6715df8d5d24655b9fd368e904028112b54c7de1 ]
This commits updates the following functions to allow reads from uninitialized stack locations when env->allow_uninit_stack option is enabled:
- check_stack_read_fixed_off()
- check_stack_range_initialized(), called from:
- check_stack_read_var_off()
- check_helper_mem_access()
Such change allows to relax logic in stacksafe() to treat STACK_MISC and STACK_INVALID in a same way and make the following stack slot configurations equivalent:
| Cached state | Current state | | stack slot | stack slot | |------------------+------------------| | STACK_INVALID or | STACK_INVALID or | | STACK_MISC | STACK_SPILL or | | | STACK_MISC or | | | STACK_ZERO or | | | STACK_DYNPTR |
This leads to significant verification speed gains (see below).
The idea was suggested by Andrii Nakryiko [1] and initial patch was created by Alexei Starovoitov [2].
Currently the env->allow_uninit_stack is allowed for programs loaded by users with CAP_PERFMON or CAP_SYS_ADMIN capabilities.
A number of test cases from verifier/*.c were expecting uninitialized stack access to be an error. These test cases were updated to execute in unprivileged mode (thus preserving the tests).
The test progs/test_global_func10.c expected "invalid indirect read from stack" error message because of the access to uninitialized memory region. This error is no longer possible in privileged mode. The test is updated to provoke an error "invalid indirect access to stack" because of access to invalid stack address (such error is not verified by progs/test_global_func*.c series of tests).
The following tests had to be removed because these can't be made unprivileged:
- verifier/sock.c:
- "sk_storage_get(map, skb->sk, &stack_value, 1): partially init stack_value"
BPF_PROG_TYPE_SCHED_CLS programs are not executed in unprivileged mode.
- verifier/var_off.c:
- "indirect variable-offset stack access, max_off+size > max_initialized"
- "indirect variable-offset stack access, uninitialized" These tests verify that access to uninitialized stack values is detected when stack offset is not a constant. However, variable stack access is prohibited in unprivileged mode, thus these tests are no longer valid.
* * *
Here is veristat log comparing this patch with current master on a set of selftest binaries listed in tools/testing/selftests/bpf/veristat.cfg and cilium BPF binaries (see [3]):
$ ./veristat -e file,prog,states -C -f 'states_pct<-30' master.log current.log File Program States (A) States (B) States (DIFF) -------------------------- -------------------------- ---------- ---------- ---------------- bpf_host.o tail_handle_ipv6_from_host 349 244 -105 (-30.09%) bpf_host.o tail_handle_nat_fwd_ipv4 1320 895 -425 (-32.20%) bpf_lxc.o tail_handle_nat_fwd_ipv4 1320 895 -425 (-32.20%) bpf_sock.o cil_sock4_connect 70 48 -22 (-31.43%) bpf_sock.o cil_sock4_sendmsg 68 46 -22 (-32.35%) bpf_xdp.o tail_handle_nat_fwd_ipv4 1554 803 -751 (-48.33%) bpf_xdp.o tail_lb_ipv4 6457 2473 -3984 (-61.70%) bpf_xdp.o tail_lb_ipv6 7249 3908 -3341 (-46.09%) pyperf600_bpf_loop.bpf.o on_event 287 145 -142 (-49.48%) strobemeta.bpf.o on_event 15915 4772 -11143 (-70.02%) strobemeta_nounroll2.bpf.o on_event 17087 3820 -13267 (-77.64%) xdp_synproxy_kern.bpf.o syncookie_tc 21271 6635 -14636 (-68.81%) xdp_synproxy_kern.bpf.o syncookie_xdp 23122 6024 -17098 (-73.95%) -------------------------- -------------------------- ---------- ---------- ----------------
Note: I limited selection by states_pct<-30%.
Inspection of differences in pyperf600_bpf_loop behavior shows that the following patch for the test removes almost all differences:
- a/tools/testing/selftests/bpf/progs/pyperf.h
+ b/tools/testing/selftests/bpf/progs/pyperf.h
@ -266,8 +266,8 @ int __on_event(struct bpf_raw_tracepoint_args *ctx)
}
if (event->pthread_match || !pidData->use_tls) {
- void* frame_ptr;
- FrameData frame;
+ void* frame_ptr = 0;
+ FrameData frame = {};
Symbol sym = {};
int cur_cpu = bpf_get_smp_processor_id();
W/o this patch the difference comes from the following pattern (for different variables):
static bool get_frame_data(... FrameData *frame ...)
{
...
bpf_probe_read_user(&frame->f_code, ...);
if (!frame->f_code)
return false;
...
bpf_probe_read_user(&frame->co_name, ...);
if (frame->co_name)
...;
}
int __on_event(struct bpf_raw_tracepoint_args *ctx)
{
FrameData frame;
...
get_frame_data(... &frame ...) // indirectly via a bpf_loop & callback
...
}
SEC("raw_tracepoint/kfree_skb")
int on_event(struct bpf_raw_tracepoint_args* ctx)
{
...
ret |= __on_event(ctx);
ret |= __on_event(ctx);
...
}With regards to value frame->co_name the following is important:
- Because of the conditional if (!frame->f_code) each call to __on_event() produces two states, one with frame->co_name marked as STACK_MISC, another with it as is (and marked STACK_INVALID on a first call).
- The call to bpf_probe_read_user() does not mark stack slots corresponding to &frame->co_name as REG_LIVE_WRITTEN but it marks these slots as BPF_MISC, this happens because of the following loop in the check_helper_call():
for (i = 0; i < meta.access_size; i++) {
err = check_mem_access(env, insn_idx, meta.regno, i, BPF_B,
BPF_WRITE, -1, false);
if (err)
return err;
} Note the size of the write, it is a one byte write for each byte touched by a helper. The BPF_B write does not lead to write marks for the target stack slot.
- Which means that w/o this patch when second __on_event() call is verified if (frame->co_name) will propagate read marks first to a stack slot with STACK_MISC marks and second to a stack slot with STACK_INVALID marks and these states would be considered different.
[1] https://lore.kernel.org/bpf/CAEf4BzY3e+ZuC6HUa8dCiUovQRg2SzEk7M-dSkqNZyn=xEmnPA@mail.gmail.com/
[2] https://lore.kernel.org/bpf/CAADnVQKs2i1iuZ5SUGuJtxWVfGYR9kDgYKhq3rNV+kBLQCu7rA@mail.gmail.com/
[3] [email protected]:anakryiko/cilium.git
---
Backporting to address the complexity regression introduced by commit 71f656a50176 ("bpf: Fix to preserve reg parent/live fields when copying range info"), that affects Cilium built with LLVM 18.
kernel/bpf/verifier.c | 11 +- .../selftests/bpf/progs/test_global_func10.c | 31 +++ tools/testing/selftests/bpf/verifier/calls.c | 13 +- .../bpf/verifier/helper_access_var_len.c | 104 ++++++--- .../testing/selftests/bpf/verifier/int_ptr.c | 9 +- .../selftests/bpf/verifier/search_pruning.c | 13 +- tools/testing/selftests/bpf/verifier/sock.c | 27 --- .../selftests/bpf/verifier/spill_fill.c | 211 ++++++++++++++++++ .../testing/selftests/bpf/verifier/var_off.c | 52 ----- 9 files changed, 342 insertions(+), 129 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/test_global_func10.c
kernel/bpf/verifier.c +10 -1
@@ -2807,6 +2807,8 @@ static int check_stack_read_fixed_off(struct bpf_verifier_env *env,continue ;if (type ==STACK_MISC )continue ; +if (type ==STACK_INVALID && env->allow_uninit_stack) +continue ;verbose (env,"invalid read from stack off %d+%d size %d\n" , off, i, size);return -EACCES ;
@@ -2844,6 +2846,8 @@ static int check_stack_read_fixed_off(struct bpf_verifier_env *env,continue ;if (type ==STACK_ZERO )continue ; +if (type ==STACK_INVALID && env->allow_uninit_stack) +continue ;verbose (env,"invalid read from stack off %d+%d size %d\n" , off, i, size);return -EACCES ;
@@ -4300,7 +4304,8 @@ static int check_stack_range_initialized( stype = &state->stack[spi].slot_type[slot %BPF_REG_SIZE ];if (*stype ==STACK_MISC ) goto mark; -if (*stype ==STACK_ZERO ) { +if ((*stype ==STACK_ZERO ) || + (*stype ==STACK_INVALID && env->allow_uninit_stack)) {if (clobber) {/* helper can write anything into the stack */ *stype =STACK_MISC ;
@@ -9492,6 +9497,10 @@ static bool stacksafe(struct bpf_verifier_env *env, struct bpf_func_state *old,if (old->stack[spi].slot_type[i %BPF_REG_SIZE ] ==STACK_INVALID )continue ; +if (env->allow_uninit_stack && + old->stack[spi].slot_type[i %BPF_REG_SIZE ] ==STACK_MISC ) +continue ; +/* explored stack has more populated slots than current stack * and these slots were used */
tools/testing/selftests/bpf/progs/test_global_func10.c new file +31 -0
@@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include <stddef.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include "bpf_misc.h" + +struct Small { +long x; +}; + +struct Big { +long x; +long y; +}; + +__noinline int foo(const struct Big *big) +{ +if (!big) +return 0 ; + +return bpf_get_prandom_u32 () < big->y; +} + +SEC("cgroup_skb/ingress") +__failure __msg("invalid indirect access to stack") +int global_func10(struct __sk_buff *skb) +{ +const struct Small small = {.x = skb->len }; + +return foo ((struct Big *)&small) ?1 :0 ; +}
tools/testing/selftests/bpf/verifier/calls.c +8 -5
@@ -1948,19 +1948,22 @@* that fp-8 stack slot was unused in the fall-through * branch and will accept the program incorrectly */ -BPF_JMP_IMM (BPF_JGT ,BPF_REG_1 ,2 ,2 ), +BPF_EMIT_CALL (BPF_FUNC_get_prandom_u32), +BPF_JMP_IMM (BPF_JGT ,BPF_REG_0 ,2 ,2 ),BPF_ST_MEM (BPF_DW ,BPF_REG_10 ,-8 ,0 ),BPF_JMP_IMM (BPF_JA ,0 ,0 ,0 ),BPF_MOV64_REG (BPF_REG_2 ,BPF_REG_10 ),BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 ,-8 ),BPF_LD_MAP_FD (BPF_REG_1 ,0 ),BPF_RAW_INSN (BPF_JMP |BPF_CALL ,0 ,0 ,0 , BPF_FUNC_map_lookup_elem), +BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .fixup_map_hash_48b = { 6 }, - .errstr = "invalid indirect read from stack R2 off -8+0 size 8", - .result = REJECT, - .prog_type = BPF_PROG_TYPE_XDP, + .fixup_map_hash_48b = { 7 }, + .errstr_unpriv = "invalid indirect read from stack R2 off -8+0 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, }, { "calls: ctx read at start of subprog",
tools/testing/selftests/bpf/verifier/helper_access_var_len.c +69 -35
137 lines not on this page · raw message
tools/testing/selftests/bpf/verifier/int_ptr.c +5 -4
@@ -54,12 +54,13 @@/* bpf_strtoul() */ BPF_EMIT_CALL (BPF_FUNC_strtoul), -BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .result =REJECT , - .prog_type = BPF_PROG_TYPE_CGROUP_SYSCTL, - .errstr = "invalid indirect read from stack R4 off -16+4 size 8", + .result_unpriv =REJECT , + .errstr_unpriv = "invalid indirect read from stack R4 off -16+4 size 8", +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, }, { "ARG_PTR_TO_LONG misaligned",
tools/testing/selftests/bpf/verifier/search_pruning.c +8 -5
@@ -128,9 +128,10 @@ BPF_EXIT_INSN(), }, .fixup_map_hash_8b = { 3 }, - .errstr = "invalid read from stack off -16+0 size 8", - .result = REJECT, - .prog_type =BPF_PROG_TYPE_TRACEPOINT , + .errstr_unpriv = "invalid read from stack off -16+0 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result =ACCEPT , }, { "allocated_stack",
@@ -187,6 +188,8 @@ BPF_EXIT_INSN(), }, .flags = BPF_F_TEST_STATE_FREQ, - .errstr = "invalid read from stack off -8+1 size 8", - .result = REJECT, + .errstr_unpriv = "invalid read from stack off -8+1 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, },
tools/testing/selftests/bpf/verifier/sock.c +0 -27
@@ -530,33 +530,6 @@ .prog_type = BPF_PROG_TYPE_SCHED_CLS, .result = ACCEPT, }, -{ - "sk_storage_get(map, skb->sk, &stack_value, 1): partially init stack_value", - .insns = { -BPF_MOV64_IMM (BPF_REG_2 ,0 ), -BPF_STX_MEM (BPF_W ,BPF_REG_10 ,BPF_REG_2 ,-8 ), -BPF_LDX_MEM (BPF_DW ,BPF_REG_1 ,BPF_REG_1 , offsetof(struct __sk_buff , sk)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_1 ,0 ,2 ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), -BPF_EXIT_INSN (), -BPF_EMIT_CALL (BPF_FUNC_sk_fullsock), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_0 ,0 ,2 ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), -BPF_EXIT_INSN (), -BPF_MOV64_IMM (BPF_REG_4 ,1 ), -BPF_MOV64_REG (BPF_REG_3 ,BPF_REG_10 ), -BPF_ALU64_IMM (BPF_ADD ,BPF_REG_3 ,-8 ), -BPF_MOV64_REG (BPF_REG_2 ,BPF_REG_0 ), -BPF_LD_MAP_FD (BPF_REG_1 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_sk_storage_get), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), - BPF_EXIT_INSN(), - }, - .fixup_sk_storage_map = { 14 }, - .prog_type = BPF_PROG_TYPE_SCHED_CLS, - .result = REJECT, - .errstr = "invalid indirect read from stack", -}, { "bpf_map_lookup_elem(smap, &key)", .insns = {
tools/testing/selftests/bpf/verifier/spill_fill.c +211 -0
214 lines not on this page · raw message
tools/testing/selftests/bpf/verifier/var_off.c +0 -52
64 lines not on this page · raw message
Signature · 1 line
2.45.2
PATCH 1/1 bpf: Allow reads from uninit stack
From: Eduard Zingerman <[email protected]>
[ Upstream commit 6715df8d5d24655b9fd368e904028112b54c7de1 ]
This commits updates the following functions to allow reads from uninitialized stack locations when env->allow_uninit_stack option is enabled:
- check_stack_read_fixed_off()
- check_stack_range_initialized(), called from:
- check_stack_read_var_off()
- check_helper_mem_access()
Such change allows to relax logic in stacksafe() to treat STACK_MISC and STACK_INVALID in a same way and make the following stack slot configurations equivalent:
| Cached state | Current state | | stack slot | stack slot | |------------------+------------------| | STACK_INVALID or | STACK_INVALID or | | STACK_MISC | STACK_SPILL or | | | STACK_MISC or | | | STACK_ZERO or | | | STACK_DYNPTR |
This leads to significant verification speed gains (see below).
The idea was suggested by Andrii Nakryiko [1] and initial patch was created by Alexei Starovoitov [2].
Currently the env->allow_uninit_stack is allowed for programs loaded by users with CAP_PERFMON or CAP_SYS_ADMIN capabilities.
A number of test cases from verifier/*.c were expecting uninitialized stack access to be an error. These test cases were updated to execute in unprivileged mode (thus preserving the tests).
The test progs/test_global_func10.c expected "invalid indirect read from stack" error message because of the access to uninitialized memory region. This error is no longer possible in privileged mode. The test is updated to provoke an error "invalid indirect access to stack" because of access to invalid stack address (such error is not verified by progs/test_global_func*.c series of tests).
The following tests had to be removed because these can't be made unprivileged:
- verifier/sock.c:
- "sk_storage_get(map, skb->sk, &stack_value, 1): partially init stack_value"
BPF_PROG_TYPE_SCHED_CLS programs are not executed in unprivileged mode.
- verifier/var_off.c:
- "indirect variable-offset stack access, max_off+size > max_initialized"
- "indirect variable-offset stack access, uninitialized" These tests verify that access to uninitialized stack values is detected when stack offset is not a constant. However, variable stack access is prohibited in unprivileged mode, thus these tests are no longer valid.
* * *
Here is veristat log comparing this patch with current master on a set of selftest binaries listed in tools/testing/selftests/bpf/veristat.cfg and cilium BPF binaries (see [3]):
$ ./veristat -e file,prog,states -C -f 'states_pct<-30' master.log current.log File Program States (A) States (B) States (DIFF) -------------------------- -------------------------- ---------- ---------- ---------------- bpf_host.o tail_handle_ipv6_from_host 349 244 -105 (-30.09%) bpf_host.o tail_handle_nat_fwd_ipv4 1320 895 -425 (-32.20%) bpf_lxc.o tail_handle_nat_fwd_ipv4 1320 895 -425 (-32.20%) bpf_sock.o cil_sock4_connect 70 48 -22 (-31.43%) bpf_sock.o cil_sock4_sendmsg 68 46 -22 (-32.35%) bpf_xdp.o tail_handle_nat_fwd_ipv4 1554 803 -751 (-48.33%) bpf_xdp.o tail_lb_ipv4 6457 2473 -3984 (-61.70%) bpf_xdp.o tail_lb_ipv6 7249 3908 -3341 (-46.09%) pyperf600_bpf_loop.bpf.o on_event 287 145 -142 (-49.48%) strobemeta.bpf.o on_event 15915 4772 -11143 (-70.02%) strobemeta_nounroll2.bpf.o on_event 17087 3820 -13267 (-77.64%) xdp_synproxy_kern.bpf.o syncookie_tc 21271 6635 -14636 (-68.81%) xdp_synproxy_kern.bpf.o syncookie_xdp 23122 6024 -17098 (-73.95%) -------------------------- -------------------------- ---------- ---------- ----------------
Note: I limited selection by states_pct<-30%.
Inspection of differences in pyperf600_bpf_loop behavior shows that the following patch for the test removes almost all differences:
- a/tools/testing/selftests/bpf/progs/pyperf.h
+ b/tools/testing/selftests/bpf/progs/pyperf.h
@ -266,8 +266,8 @ int __on_event(struct bpf_raw_tracepoint_args *ctx)
}
if (event->pthread_match || !pidData->use_tls) {
- void* frame_ptr;
- FrameData frame;
+ void* frame_ptr = 0;
+ FrameData frame = {};
Symbol sym = {};
int cur_cpu = bpf_get_smp_processor_id();
W/o this patch the difference comes from the following pattern (for different variables):
static bool get_frame_data(... FrameData *frame ...)
{
...
bpf_probe_read_user(&frame->f_code, ...);
if (!frame->f_code)
return false;
...
bpf_probe_read_user(&frame->co_name, ...);
if (frame->co_name)
...;
}
int __on_event(struct bpf_raw_tracepoint_args *ctx)
{
FrameData frame;
...
get_frame_data(... &frame ...) // indirectly via a bpf_loop & callback
...
}
SEC("raw_tracepoint/kfree_skb")
int on_event(struct bpf_raw_tracepoint_args* ctx)
{
...
ret |= __on_event(ctx);
ret |= __on_event(ctx);
...
}With regards to value frame->co_name the following is important:
- Because of the conditional if (!frame->f_code) each call to __on_event() produces two states, one with frame->co_name marked as STACK_MISC, another with it as is (and marked STACK_INVALID on a first call).
- The call to bpf_probe_read_user() does not mark stack slots corresponding to &frame->co_name as REG_LIVE_WRITTEN but it marks these slots as BPF_MISC, this happens because of the following loop in the check_helper_call():
for (i = 0; i < meta.access_size; i++) {
err = check_mem_access(env, insn_idx, meta.regno, i, BPF_B,
BPF_WRITE, -1, false);
if (err)
return err;
} Note the size of the write, it is a one byte write for each byte touched by a helper. The BPF_B write does not lead to write marks for the target stack slot.
- Which means that w/o this patch when second __on_event() call is verified if (frame->co_name) will propagate read marks first to a stack slot with STACK_MISC marks and second to a stack slot with STACK_INVALID marks and these states would be considered different.
[1] https://lore.kernel.org/bpf/CAEf4BzY3e+ZuC6HUa8dCiUovQRg2SzEk7M-dSkqNZyn=xEmnPA@mail.gmail.com/
[2] https://lore.kernel.org/bpf/CAADnVQKs2i1iuZ5SUGuJtxWVfGYR9kDgYKhq3rNV+kBLQCu7rA@mail.gmail.com/
[3] [email protected]:anakryiko/cilium.git
---
Backporting to address the complexity regression introduced by commit 71f656a50176 ("bpf: Fix to preserve reg parent/live fields when copying range info"), that affects Cilium built with LLVM 18.
kernel/bpf/verifier.c | 11 +- .../selftests/bpf/progs/test_global_func10.c | 9 +- tools/testing/selftests/bpf/verifier/calls.c | 13 +- .../bpf/verifier/helper_access_var_len.c | 104 ++++++--- .../testing/selftests/bpf/verifier/int_ptr.c | 9 +- .../selftests/bpf/verifier/search_pruning.c | 13 +- tools/testing/selftests/bpf/verifier/sock.c | 27 --- .../selftests/bpf/verifier/spill_fill.c | 211 ++++++++++++++++++ .../testing/selftests/bpf/verifier/var_off.c | 52 ----- 9 files changed, 316 insertions(+), 133 deletions(-)
kernel/bpf/verifier.c +10 -1
@@ -3159,6 +3159,8 @@ static int check_stack_read_fixed_off(struct bpf_verifier_env *env,continue ;if (type ==STACK_MISC )continue ; +if (type ==STACK_INVALID && env->allow_uninit_stack) +continue ;verbose (env,"invalid read from stack off %d+%d size %d\n" , off, i, size);return -EACCES ;
@@ -3196,6 +3198,8 @@ static int check_stack_read_fixed_off(struct bpf_verifier_env *env,continue ;if (type ==STACK_ZERO )continue ; +if (type ==STACK_INVALID && env->allow_uninit_stack) +continue ;verbose (env,"invalid read from stack off %d+%d size %d\n" , off, i, size);return -EACCES ;
@@ -4782,7 +4786,8 @@ static int check_stack_range_initialized( stype = &state->stack[spi].slot_type[slot %BPF_REG_SIZE ];if (*stype ==STACK_MISC ) goto mark; -if (*stype ==STACK_ZERO ) { +if ((*stype ==STACK_ZERO ) || + (*stype ==STACK_INVALID && env->allow_uninit_stack)) {if (clobber) {/* helper can write anything into the stack */ *stype =STACK_MISC ;
@@ -10625,6 +10630,10 @@ static bool stacksafe(struct bpf_verifier_env *env, struct bpf_func_state *old,if (old->stack[spi].slot_type[i %BPF_REG_SIZE ] ==STACK_INVALID )continue ; +if (env->allow_uninit_stack && + old->stack[spi].slot_type[i %BPF_REG_SIZE ] ==STACK_MISC ) +continue ; +/* explored stack has more populated slots than current stack * and these slots were used */
tools/testing/selftests/bpf/progs/test_global_func10.c +5 -4
@@ -4,12 +4,12 @@#include <bpf/bpf_helpers.h> struct Small { -int x; +long x; };struct Big { -int x; -int y; +long x; +long y; }; __noinline int foo(const struct Big *big)
@@ -21,7 +21,8 @@ __noinline int foo(const struct Big *big) } SEC("cgroup_skb/ingress") -int test_cls (struct __sk_buff *skb) +__failure __msg("invalid indirect access to stack") +int global_func10(struct __sk_buff *skb) {const struct Small small = {.x = skb->len };
tools/testing/selftests/bpf/verifier/calls.c +8 -5
@@ -1967,19 +1967,22 @@* that fp-8 stack slot was unused in the fall-through * branch and will accept the program incorrectly */ -BPF_JMP_IMM (BPF_JGT ,BPF_REG_1 ,2 ,2 ), +BPF_EMIT_CALL (BPF_FUNC_get_prandom_u32), +BPF_JMP_IMM (BPF_JGT ,BPF_REG_0 ,2 ,2 ),BPF_ST_MEM (BPF_DW ,BPF_REG_10 ,-8 ,0 ),BPF_JMP_IMM (BPF_JA ,0 ,0 ,0 ),BPF_MOV64_REG (BPF_REG_2 ,BPF_REG_10 ),BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 ,-8 ),BPF_LD_MAP_FD (BPF_REG_1 ,0 ),BPF_RAW_INSN (BPF_JMP |BPF_CALL ,0 ,0 ,0 , BPF_FUNC_map_lookup_elem), +BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .fixup_map_hash_48b = { 6 }, - .errstr = "invalid indirect read from stack R2 off -8+0 size 8", - .result = REJECT, - .prog_type = BPF_PROG_TYPE_XDP, + .fixup_map_hash_48b = { 7 }, + .errstr_unpriv = "invalid indirect read from stack R2 off -8+0 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, }, { "calls: ctx read at start of subprog",
tools/testing/selftests/bpf/verifier/helper_access_var_len.c +69 -35
137 lines not on this page · raw message
tools/testing/selftests/bpf/verifier/int_ptr.c +5 -4
@@ -54,12 +54,13 @@/* bpf_strtoul() */ BPF_EMIT_CALL (BPF_FUNC_strtoul), -BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .result =REJECT , - .prog_type = BPF_PROG_TYPE_CGROUP_SYSCTL, - .errstr = "invalid indirect read from stack R4 off -16+4 size 8", + .result_unpriv =REJECT , + .errstr_unpriv = "invalid indirect read from stack R4 off -16+4 size 8", +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, }, { "ARG_PTR_TO_LONG misaligned",
tools/testing/selftests/bpf/verifier/search_pruning.c +8 -5
@@ -128,9 +128,10 @@ BPF_EXIT_INSN(), }, .fixup_map_hash_8b = { 3 }, - .errstr = "invalid read from stack off -16+0 size 8", - .result = REJECT, - .prog_type =BPF_PROG_TYPE_TRACEPOINT , + .errstr_unpriv = "invalid read from stack off -16+0 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result =ACCEPT , }, { "allocated_stack",
@@ -187,6 +188,8 @@ BPF_EXIT_INSN(), }, .flags = BPF_F_TEST_STATE_FREQ, - .errstr = "invalid read from stack off -8+1 size 8", - .result = REJECT, + .errstr_unpriv = "invalid read from stack off -8+1 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, },
tools/testing/selftests/bpf/verifier/sock.c +0 -27
@@ -530,33 +530,6 @@ .prog_type = BPF_PROG_TYPE_SCHED_CLS, .result = ACCEPT, }, -{ - "sk_storage_get(map, skb->sk, &stack_value, 1): partially init stack_value", - .insns = { -BPF_MOV64_IMM (BPF_REG_2 ,0 ), -BPF_STX_MEM (BPF_W ,BPF_REG_10 ,BPF_REG_2 ,-8 ), -BPF_LDX_MEM (BPF_DW ,BPF_REG_1 ,BPF_REG_1 , offsetof(struct __sk_buff , sk)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_1 ,0 ,2 ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), -BPF_EXIT_INSN (), -BPF_EMIT_CALL (BPF_FUNC_sk_fullsock), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_0 ,0 ,2 ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), -BPF_EXIT_INSN (), -BPF_MOV64_IMM (BPF_REG_4 ,1 ), -BPF_MOV64_REG (BPF_REG_3 ,BPF_REG_10 ), -BPF_ALU64_IMM (BPF_ADD ,BPF_REG_3 ,-8 ), -BPF_MOV64_REG (BPF_REG_2 ,BPF_REG_0 ), -BPF_LD_MAP_FD (BPF_REG_1 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_sk_storage_get), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), - BPF_EXIT_INSN(), - }, - .fixup_sk_storage_map = { 14 }, - .prog_type = BPF_PROG_TYPE_SCHED_CLS, - .result = REJECT, - .errstr = "invalid indirect read from stack", -}, { "bpf_map_lookup_elem(smap, &key)", .insns = {
tools/testing/selftests/bpf/verifier/spill_fill.c +211 -0
214 lines not on this page · raw message
tools/testing/selftests/bpf/verifier/var_off.c +0 -52
64 lines not on this page · raw message
Signature · 1 line
2.45.2
BPF selftest failed to build
Hi All,
We found BPF sefltest fail to build with following error:
08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:1: error: unknown type name '__failure'
08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack")
08-09 20:39:59 DBG: |output|: ^
08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:17: error: expected parameter declarator
08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack")
08-09 20:39:59 DBG: |output|: ^
08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:17: error: expected ')'
08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:16: note: to match this '('
08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack")
08-09 20:39:59 DBG: |output|: ^
08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:52: error: expected ';' after top level declarator
08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack")
08-09 20:39:59 DBG: |output|: ^
08-09 20:39:59 DBG: |output|: ;
08-09 20:39:59 DBG: |output|: 4 errors generated.
08-09 20:39:59 DBG: |output|: make: *** [Makefile:470: /root/oltf/work/linux-bpf-qa/tools/testing/selftests/bpf/test_global_func10.o] Error 1
08-09 20:39:59 DBG: |output|: make: *** Waiting for unfinished jobs....It happens from the commit e30bc19a9ee8("bpf: Allow reads from uninit stack"). We did a further look, '__failure' is defined in tools/testing/selftests/bpf/progs/bpf_misc.h, and was 1st introduced in commit 537c3f66eac1("selftests/bpf: add generic BPF program tester-loader") which is not backported to linux-5.15.y.
So we may need to revert the patch, or fix it.
Kind regards,
Sherry
Re: BPF selftest failed to build
Quoted 22 lines · Sherry Yang
Hi All,
We found BPF sefltest fail to build with following error:
08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:1: error: unknown type name '__failure' 08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack") 08-09 20:39:59 DBG: |output|: ^ 08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:17: error: expected parameter declarator 08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack") 08-09 20:39:59 DBG: |output|: ^ 08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:17: error: expected ')' 08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:16: note: to match this '(' 08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack") 08-09 20:39:59 DBG: |output|: ^ 08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:52: error: expected ';' after top level declarator 08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack") 08-09 20:39:59 DBG: |output|: ^ 08-09 20:39:59 DBG: |output|: ; 08-09 20:39:59 DBG: |output|: 4 errors generated. 08-09 20:39:59 DBG: |output|: make: *** [Makefile:470: /root/oltf/work/linux-bpf-qa/tools/testing/selftests/bpf/test_global_func10.o] Error 1 08-09 20:39:59 DBG: |output|: make: *** Waiting for unfinished jobs....
Quoted 7 lines
It happens from the commit
e30bc19a9ee8("bpf: Allow reads from uninit stack"). We did a further look, '__failure' is defined intools/testing/selftests/bpf/progs/bpf_misc.h, and was 1st introduced in commit 537c3f66eac1("selftests/bpf: add generic BPF program tester-loader") which is not backported to linux-5.15.y.So we may need to revert the patch, or fix it.
To fix it I think we just need to drop the use of __failure and __msg in progs/test_global_func10.c, and update the "struct test_def tests[]" table in prog_tests/test_global_funcs.c with the new verifier rejection message.
On the other hand I believe commit 537c3f66eac1("selftests/bpf: add generic BPF program tester-loader") should be relatively easy to backport, just picking that commit up and resolving simple conflict in Makefile should be enough. It will also save a lot of future headaches like this one.
(Note: the generic test-loader patch will need to backport it to stable 6.1 first before it an be backported to 5.15, as per the stable rule[1])
Greg KH
maintainerRe: BPF selftest failed to build
Quoted 36 lines · Shung-Hsi Yu
Quoted 22 lines · Sherry Yang
Hi All,
We found BPF sefltest fail to build with following error:
08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:1: error: unknown type name '__failure' 08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack") 08-09 20:39:59 DBG: |output|: ^ 08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:17: error: expected parameter declarator 08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack") 08-09 20:39:59 DBG: |output|: ^ 08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:17: error: expected ')' 08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:16: note: to match this '(' 08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack") 08-09 20:39:59 DBG: |output|: ^ 08-09 20:39:59 DBG: |output|: progs/test_global_func10.c:24:52: error: expected ';' after top level declarator 08-09 20:39:59 DBG: |output|: __failure __msg("invalid indirect access to stack") 08-09 20:39:59 DBG: |output|: ^ 08-09 20:39:59 DBG: |output|: ; 08-09 20:39:59 DBG: |output|: 4 errors generated. 08-09 20:39:59 DBG: |output|: make: *** [Makefile:470: /root/oltf/work/linux-bpf-qa/tools/testing/selftests/bpf/test_global_func10.o] Error 1 08-09 20:39:59 DBG: |output|: make: *** Waiting for unfinished jobs....Quoted 7 lines
It happens from the commit
e30bc19a9ee8("bpf: Allow reads from uninit stack"). We did a further look, '__failure' is defined intools/testing/selftests/bpf/progs/bpf_misc.h, and was 1st introduced in commit 537c3f66eac1("selftests/bpf: add generic BPF program tester-loader") which is not backported to linux-5.15.y.So we may need to revert the patch, or fix it.
To fix it I think we just need to drop the use of
__failureand__msginprogs/test_global_func10.c, and update the "structtest_deftests[]" table inprog_tests/test_global_funcs.cwith the new verifier rejection message.
Quoted 5 lines
On the other hand I believe commit 537c3f66eac1("selftests/bpf: add generic BPF program tester-loader") should be relatively easy to backport, just picking that commit up and resolving simple conflict in
Makefileshould be enough. It will also save a lot of future headaches like this one.
Please submit a patch like this and we will be glad to pick it up.
thanks,
greg k-h
PATCH 1/1 bpf: Allow reads from uninit stack
In reply to Maxim MikityanskiyFrom: Eduard Zingerman <[email protected]>
[ Upstream commit 6715df8d5d24655b9fd368e904028112b54c7de1 ]
This commits updates the following functions to allow reads from uninitialized stack locations when env->allow_uninit_stack option is enabled:
- check_stack_read_fixed_off()
- check_stack_range_initialized(), called from:
- check_stack_read_var_off()
- check_helper_mem_access()
Such change allows to relax logic in stacksafe() to treat STACK_MISC and STACK_INVALID in a same way and make the following stack slot configurations equivalent:
| Cached state | Current state | | stack slot | stack slot | |------------------+------------------| | STACK_INVALID or | STACK_INVALID or | | STACK_MISC | STACK_SPILL or | | | STACK_MISC or | | | STACK_ZERO or | | | STACK_DYNPTR |
This leads to significant verification speed gains (see below).
The idea was suggested by Andrii Nakryiko [1] and initial patch was created by Alexei Starovoitov [2].
Currently the env->allow_uninit_stack is allowed for programs loaded by users with CAP_PERFMON or CAP_SYS_ADMIN capabilities.
A number of test cases from verifier/*.c were expecting uninitialized stack access to be an error. These test cases were updated to execute in unprivileged mode (thus preserving the tests).
The test progs/test_global_func10.c expected "invalid indirect read from stack" error message because of the access to uninitialized memory region. This error is no longer possible in privileged mode. The test is updated to provoke an error "invalid indirect access to stack" because of access to invalid stack address (such error is not verified by progs/test_global_func*.c series of tests).
The following tests had to be removed because these can't be made unprivileged:
- verifier/sock.c:
- "sk_storage_get(map, skb->sk, &stack_value, 1): partially init stack_value"
BPF_PROG_TYPE_SCHED_CLS programs are not executed in unprivileged mode.
- verifier/var_off.c:
- "indirect variable-offset stack access, max_off+size > max_initialized"
- "indirect variable-offset stack access, uninitialized" These tests verify that access to uninitialized stack values is detected when stack offset is not a constant. However, variable stack access is prohibited in unprivileged mode, thus these tests are no longer valid.
* * *
Here is veristat log comparing this patch with current master on a set of selftest binaries listed in tools/testing/selftests/bpf/veristat.cfg and cilium BPF binaries (see [3]):
$ ./veristat -e file,prog,states -C -f 'states_pct<-30' master.log current.log File Program States (A) States (B) States (DIFF) -------------------------- -------------------------- ---------- ---------- ---------------- bpf_host.o tail_handle_ipv6_from_host 349 244 -105 (-30.09%) bpf_host.o tail_handle_nat_fwd_ipv4 1320 895 -425 (-32.20%) bpf_lxc.o tail_handle_nat_fwd_ipv4 1320 895 -425 (-32.20%) bpf_sock.o cil_sock4_connect 70 48 -22 (-31.43%) bpf_sock.o cil_sock4_sendmsg 68 46 -22 (-32.35%) bpf_xdp.o tail_handle_nat_fwd_ipv4 1554 803 -751 (-48.33%) bpf_xdp.o tail_lb_ipv4 6457 2473 -3984 (-61.70%) bpf_xdp.o tail_lb_ipv6 7249 3908 -3341 (-46.09%) pyperf600_bpf_loop.bpf.o on_event 287 145 -142 (-49.48%) strobemeta.bpf.o on_event 15915 4772 -11143 (-70.02%) strobemeta_nounroll2.bpf.o on_event 17087 3820 -13267 (-77.64%) xdp_synproxy_kern.bpf.o syncookie_tc 21271 6635 -14636 (-68.81%) xdp_synproxy_kern.bpf.o syncookie_xdp 23122 6024 -17098 (-73.95%) -------------------------- -------------------------- ---------- ---------- ----------------
Note: I limited selection by states_pct<-30%.
Inspection of differences in pyperf600_bpf_loop behavior shows that the following patch for the test removes almost all differences:
- a/tools/testing/selftests/bpf/progs/pyperf.h
+ b/tools/testing/selftests/bpf/progs/pyperf.h
@ -266,8 +266,8 @ int __on_event(struct bpf_raw_tracepoint_args *ctx)
}
if (event->pthread_match || !pidData->use_tls) {
- void* frame_ptr;
- FrameData frame;
+ void* frame_ptr = 0;
+ FrameData frame = {};
Symbol sym = {};
int cur_cpu = bpf_get_smp_processor_id();
W/o this patch the difference comes from the following pattern (for different variables):
static bool get_frame_data(... FrameData *frame ...)
{
...
bpf_probe_read_user(&frame->f_code, ...);
if (!frame->f_code)
return false;
...
bpf_probe_read_user(&frame->co_name, ...);
if (frame->co_name)
...;
}
int __on_event(struct bpf_raw_tracepoint_args *ctx)
{
FrameData frame;
...
get_frame_data(... &frame ...) // indirectly via a bpf_loop & callback
...
}
SEC("raw_tracepoint/kfree_skb")
int on_event(struct bpf_raw_tracepoint_args* ctx)
{
...
ret |= __on_event(ctx);
ret |= __on_event(ctx);
...
}With regards to value frame->co_name the following is important:
- Because of the conditional if (!frame->f_code) each call to __on_event() produces two states, one with frame->co_name marked as STACK_MISC, another with it as is (and marked STACK_INVALID on a first call).
- The call to bpf_probe_read_user() does not mark stack slots corresponding to &frame->co_name as REG_LIVE_WRITTEN but it marks these slots as BPF_MISC, this happens because of the following loop in the check_helper_call():
for (i = 0; i < meta.access_size; i++) {
err = check_mem_access(env, insn_idx, meta.regno, i, BPF_B,
BPF_WRITE, -1, false);
if (err)
return err;
} Note the size of the write, it is a one byte write for each byte touched by a helper. The BPF_B write does not lead to write marks for the target stack slot.
- Which means that w/o this patch when second __on_event() call is verified if (frame->co_name) will propagate read marks first to a stack slot with STACK_MISC marks and second to a stack slot with STACK_INVALID marks and these states would be considered different.
[1] https://lore.kernel.org/bpf/CAEf4BzY3e+ZuC6HUa8dCiUovQRg2SzEk7M-dSkqNZyn=xEmnPA@mail.gmail.com/
[2] https://lore.kernel.org/bpf/CAADnVQKs2i1iuZ5SUGuJtxWVfGYR9kDgYKhq3rNV+kBLQCu7rA@mail.gmail.com/
[3] [email protected]:anakryiko/cilium.git
---
Backporting to address the complexity regression introduced by commit 71f656a50176 ("bpf: Fix to preserve reg parent/live fields when copying range info"), that affects Cilium built with LLVM 18.
kernel/bpf/verifier.c | 11 +- .../selftests/bpf/progs/test_global_func10.c | 9 +- tools/testing/selftests/bpf/verifier/calls.c | 13 ++- .../bpf/verifier/helper_access_var_len.c | 104 ++++++++++++------ .../testing/selftests/bpf/verifier/int_ptr.c | 9 +- .../selftests/bpf/verifier/search_pruning.c | 13 ++- tools/testing/selftests/bpf/verifier/sock.c | 27 ----- .../selftests/bpf/verifier/spill_fill.c | 7 +- .../testing/selftests/bpf/verifier/var_off.c | 52 --------- 9 files changed, 109 insertions(+), 136 deletions(-)
kernel/bpf/verifier.c +10 -1
@@ -3599,6 +3599,8 @@ static int check_stack_read_fixed_off(struct bpf_verifier_env *env,continue ;if (type ==STACK_MISC )continue ; +if (type ==STACK_INVALID && env->allow_uninit_stack) +continue ;verbose (env,"invalid read from stack off %d+%d size %d\n" , off, i, size);return -EACCES ;
@@ -3636,6 +3638,8 @@ static int check_stack_read_fixed_off(struct bpf_verifier_env *env,continue ;if (type ==STACK_ZERO )continue ; +if (type ==STACK_INVALID && env->allow_uninit_stack) +continue ;verbose (env,"invalid read from stack off %d+%d size %d\n" , off, i, size);return -EACCES ;
@@ -5426,7 +5430,8 @@ static int check_stack_range_initialized( stype = &state->stack[spi].slot_type[slot %BPF_REG_SIZE ];if (*stype ==STACK_MISC ) goto mark; -if (*stype ==STACK_ZERO ) { +if ((*stype ==STACK_ZERO ) || + (*stype ==STACK_INVALID && env->allow_uninit_stack)) {if (clobber) {/* helper can write anything into the stack */ *stype =STACK_MISC ;
@@ -11967,6 +11972,10 @@ static bool stacksafe(struct bpf_verifier_env *env, struct bpf_func_state *old,if (old->stack[spi].slot_type[i %BPF_REG_SIZE ] ==STACK_INVALID )continue ; +if (env->allow_uninit_stack && + old->stack[spi].slot_type[i %BPF_REG_SIZE ] ==STACK_MISC ) +continue ; +/* explored stack has more populated slots than current stack * and these slots were used */
tools/testing/selftests/bpf/progs/test_global_func10.c +5 -4
@@ -4,12 +4,12 @@#include <bpf/bpf_helpers.h> struct Small { -int x; +long x; };struct Big { -int x; -int y; +long x; +long y; }; __noinline int foo(const struct Big *big)
@@ -21,7 +21,8 @@ __noinline int foo(const struct Big *big) } SEC("cgroup_skb/ingress") -int test_cls (struct __sk_buff *skb) +__failure __msg("invalid indirect access to stack") +int global_func10(struct __sk_buff *skb) {const struct Small small = {.x = skb->len };
tools/testing/selftests/bpf/verifier/calls.c +8 -5
@@ -2221,19 +2221,22 @@* that fp-8 stack slot was unused in the fall-through * branch and will accept the program incorrectly */ -BPF_JMP_IMM (BPF_JGT ,BPF_REG_1 ,2 ,2 ), +BPF_EMIT_CALL (BPF_FUNC_get_prandom_u32), +BPF_JMP_IMM (BPF_JGT ,BPF_REG_0 ,2 ,2 ),BPF_ST_MEM (BPF_DW ,BPF_REG_10 ,-8 ,0 ),BPF_JMP_IMM (BPF_JA ,0 ,0 ,0 ),BPF_MOV64_REG (BPF_REG_2 ,BPF_REG_10 ),BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 ,-8 ),BPF_LD_MAP_FD (BPF_REG_1 ,0 ),BPF_RAW_INSN (BPF_JMP |BPF_CALL ,0 ,0 ,0 , BPF_FUNC_map_lookup_elem), +BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .fixup_map_hash_48b = { 6 }, - .errstr = "invalid indirect read from stack R2 off -8+0 size 8", - .result = REJECT, - .prog_type = BPF_PROG_TYPE_XDP, + .fixup_map_hash_48b = { 7 }, + .errstr_unpriv = "invalid indirect read from stack R2 off -8+0 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, }, { "calls: ctx read at start of subprog",
tools/testing/selftests/bpf/verifier/helper_access_var_len.c +69 -35
137 lines not on this page · raw message
tools/testing/selftests/bpf/verifier/int_ptr.c +5 -4
@@ -54,12 +54,13 @@/* bpf_strtoul() */ BPF_EMIT_CALL (BPF_FUNC_strtoul), -BPF_MOV64_IMM (BPF_REG_0 ,1 ), +BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .result =REJECT , - .prog_type = BPF_PROG_TYPE_CGROUP_SYSCTL, - .errstr = "invalid indirect read from stack R4 off -16+4 size 8", + .result_unpriv =REJECT , + .errstr_unpriv = "invalid indirect read from stack R4 off -16+4 size 8", +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, }, { "ARG_PTR_TO_LONG misaligned",
tools/testing/selftests/bpf/verifier/search_pruning.c +8 -5
@@ -128,9 +128,10 @@ BPF_EXIT_INSN(), }, .fixup_map_hash_8b = { 3 }, - .errstr = "invalid read from stack off -16+0 size 8", - .result = REJECT, - .prog_type =BPF_PROG_TYPE_TRACEPOINT , + .errstr_unpriv = "invalid read from stack off -16+0 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result =ACCEPT , }, { "precision tracking for u32 spill/fill",
@@ -258,6 +259,8 @@ BPF_EXIT_INSN(), }, .flags = BPF_F_TEST_STATE_FREQ, - .errstr = "invalid read from stack off -8+1 size 8", - .result = REJECT, + .errstr_unpriv = "invalid read from stack off -8+1 size 8", + .result_unpriv = REJECT, +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, },
tools/testing/selftests/bpf/verifier/sock.c +0 -27
@@ -530,33 +530,6 @@ .prog_type = BPF_PROG_TYPE_SCHED_CLS, .result = ACCEPT, }, -{ - "sk_storage_get(map, skb->sk, &stack_value, 1): partially init stack_value", - .insns = { -BPF_MOV64_IMM (BPF_REG_2 ,0 ), -BPF_STX_MEM (BPF_W ,BPF_REG_10 ,BPF_REG_2 ,-8 ), -BPF_LDX_MEM (BPF_DW ,BPF_REG_1 ,BPF_REG_1 , offsetof(struct __sk_buff , sk)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_1 ,0 ,2 ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), -BPF_EXIT_INSN (), -BPF_EMIT_CALL (BPF_FUNC_sk_fullsock), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_0 ,0 ,2 ), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), -BPF_EXIT_INSN (), -BPF_MOV64_IMM (BPF_REG_4 ,1 ), -BPF_MOV64_REG (BPF_REG_3 ,BPF_REG_10 ), -BPF_ALU64_IMM (BPF_ADD ,BPF_REG_3 ,-8 ), -BPF_MOV64_REG (BPF_REG_2 ,BPF_REG_0 ), -BPF_LD_MAP_FD (BPF_REG_1 ,0 ), -BPF_EMIT_CALL (BPF_FUNC_sk_storage_get), -BPF_MOV64_IMM (BPF_REG_0 ,0 ), - BPF_EXIT_INSN(), - }, - .fixup_sk_storage_map = { 14 }, - .prog_type = BPF_PROG_TYPE_SCHED_CLS, - .result = REJECT, - .errstr = "invalid indirect read from stack", -}, { "bpf_map_lookup_elem(smap, &key)", .insns = {
tools/testing/selftests/bpf/verifier/spill_fill.c +4 -3
@@ -171,9 +171,10 @@BPF_MOV64_IMM (BPF_REG_0 ,0 ), BPF_EXIT_INSN(), }, - .result =REJECT , - .errstr = "invalid read from stack off -4+0 size 4", - .prog_type = BPF_PROG_TYPE_SCHED_CLS, + .result_unpriv =REJECT , + .errstr_unpriv = "invalid read from stack off -4+0 size 4", +/* in privileged mode reads from uninitialized stack locations are permitted */ + .result = ACCEPT, }, { "Spill a u32 const scalar. Refill as u16. Offset to skb->data",
tools/testing/selftests/bpf/verifier/var_off.c +0 -52
64 lines not on this page · raw message
Signature · 1 line
2.45.2
Greg Kroah-Hartman
maintainerQuoted 168 lines · Maxim Mikityanskiy
From: Eduard Zingerman <[email protected]>
[ Upstream commit
6715df8d5d24655b9fd368e904028112b54c7de1]This commits updates the following functions to allow reads from uninitialized stack locations when
env->allow_uninit_stackoption is enabled:
-check_stack_read_fixed_off()
-check_stack_range_initialized(), called from:
-check_stack_read_var_off()
-check_helper_mem_access()Such change allows to relax logic in
stacksafe()to treatSTACK_MISCandSTACK_INVALIDin a same way and make the following stack slot configurations equivalent:| Cached state | Current state | | stack slot | stack slot | |------------------+------------------| | STACK_INVALID or | STACK_INVALID or | | STACK_MISC | STACK_SPILL or | | | STACK_MISC or | | | STACK_ZERO or | | | STACK_DYNPTR |This leads to significant verification speed gains (see below).
The idea was suggested by Andrii Nakryiko [1] and initial patch was created by Alexei Starovoitov [2].
Currently the
env->allow_uninit_stackis allowed for programs loaded by users withCAP_PERFMONorCAP_SYS_ADMINcapabilities.A number of test cases from verifier/*.c were expecting uninitialized stack access to be an error. These test cases were updated to execute in unprivileged mode (thus preserving the tests).
The test
progs/test_global_func10.cexpected "invalid indirect read from stack" error message because of the access to uninitialized memory region. This error is no longer possible in privileged mode. The test is updated to provoke an error "invalid indirect access to stack" because of access to invalid stack address (such error is not verified byprogs/test_global_func*.cseries of tests).The following tests had to be removed because these can't be made unprivileged:
-verifier/sock.c:
- "sk_storage_get(map, skb->sk, &stack_value, 1): partially initstack_value"
BPF_PROG_TYPE_SCHED_CLSprograms are not executed in unprivileged mode.
-verifier/var_off.c:
- "indirect variable-offset stack access, max_off+size >max_initialized"
- "indirect variable-offset stack access, uninitialized" These tests verify that access to uninitialized stack values is detected when stack offset is not a constant. However, variable stack access is prohibited in unprivileged mode, thus these tests are no longer valid.* * *
Here is veristat log comparing this patch with current master on a set of selftest binaries listed in
tools/testing/selftests/bpf/veristat.cfgand cilium BPF binaries (see [3]):$ ./veristat -e file,prog,states -C -f 'states_pct<-30' master.log current.log File Program States (A) States (B) States (DIFF) -------------------------- -------------------------- ---------- ---------- ---------------- bpf_host.o tail_handle_ipv6_from_host 349 244 -105 (-30.09%) bpf_host.o tail_handle_nat_fwd_ipv4 1320 895 -425 (-32.20%) bpf_lxc.o tail_handle_nat_fwd_ipv4 1320 895 -425 (-32.20%) bpf_sock.o cil_sock4_connect 70 48 -22 (-31.43%) bpf_sock.o cil_sock4_sendmsg 68 46 -22 (-32.35%) bpf_xdp.o tail_handle_nat_fwd_ipv4 1554 803 -751 (-48.33%) bpf_xdp.o tail_lb_ipv4 6457 2473 -3984 (-61.70%) bpf_xdp.o tail_lb_ipv6 7249 3908 -3341 (-46.09%) pyperf600_bpf_loop.bpf.o on_event 287 145 -142 (-49.48%) strobemeta.bpf.o on_event 15915 4772 -11143 (-70.02%) strobemeta_nounroll2.bpf.o on_event 17087 3820 -13267 (-77.64%) xdp_synproxy_kern.bpf.o syncookie_tc 21271 6635 -14636 (-68.81%) xdp_synproxy_kern.bpf.o syncookie_xdp 23122 6024 -17098 (-73.95%) -------------------------- -------------------------- ---------- ---------- ----------------Note: I limited selection by states_pct<-30%.
Inspection of differences in
pyperf600_bpf_loopbehavior shows that the following patch for the test removes almost all differences:-
a/tools/testing/selftests/bpf/progs/pyperf.h
+b/tools/testing/selftests/bpf/progs/pyperf.h
@ -266,8 +266,8 @ int__on_event(struct bpf_raw_tracepoint_args *ctx)
}if (
event->pthread_match|| !pidData->use_tls) {
- void*frame_ptr;
- FrameData frame;
+ void*frame_ptr= 0;
+ FrameData frame = {};
Symbol sym = {};
intcur_cpu=bpf_get_smp_processor_id();W/o this patch the difference comes from the following pattern (for different variables):
static bool get_frame_data(... FrameData *frame ...) { ... bpf_probe_read_user(&frame->f_code, ...); if (!frame->f_code) return false; ... bpf_probe_read_user(&frame->co_name, ...); if (frame->co_name) ...; } int __on_event(struct bpf_raw_tracepoint_args *ctx) { FrameData frame; ... get_frame_data(... &frame ...) // indirectly via a bpf_loop & callback ... } SEC("raw_tracepoint/kfree_skb") int on_event(struct bpf_raw_tracepoint_args* ctx) { ... ret |= __on_event(ctx); ret |= __on_event(ctx); ... }With regards to value
frame->co_namethe following is important:
- Because of the conditionalif (!frame->f_code)each call to__on_event()produces two states, one withframe->co_namemarked asSTACK_MISC, another with it as is (and markedSTACK_INVALIDon a first call).
- The call tobpf_probe_read_user()does not mark stack slots corresponding to&frame->co_nameasREG_LIVE_WRITTENbut it marks these slots asBPF_MISC, this happens because of the following loop in thecheck_helper_call():for (i = 0; i < meta.access_size; i++) { err = check_mem_access(env, insn_idx, meta.regno, i, BPF_B, BPF_WRITE, -1, false); if (err) return err; }Note the size of the write, it is a one byte write for each byte touched by a helper. The
BPF_Bwrite does not lead to write marks for the target stack slot.
- Which means that w/o this patch when second__on_event()call is verifiedif (frame->co_name)will propagate read marks first to a stack slot withSTACK_MISCmarks and second to a stack slot withSTACK_INVALIDmarks and these states would be considered different.[1] https://lore.kernel.org/bpf/CAEf4BzY3e+ZuC6HUa8dCiUovQRg2SzEk7M-dSkqNZyn=xEmnPA@mail.gmail.com/
[2] https://lore.kernel.org/bpf/CAADnVQKs2i1iuZ5SUGuJtxWVfGYR9kDgYKhq3rNV+kBLQCu7rA@mail.gmail.com/
[3] [email protected]:anakryiko/cilium.gitSuggested-by Andrii Nakryiko <[email protected]>Co-developed-by Alexei Starovoitov <[email protected]>Signed-off-by Eduard Zingerman <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Signed-off-by Alexei Starovoitov <[email protected]>Signed-off-by Maxim Mikityanskiy <[email protected]>
Quoted 4 lines
---
Backporting to address the complexity regression introduced by commit71f656a50176("bpf: Fix to preserve reg parent/live fields when copying range info"), that affects Cilium built with LLVM 18.
All now queued up, thanks.
greg k-h