bpf: force checkpoint when jmp history is too long
Subsystems (4)
Eduard Zingerman
maintainerPATCH v2 1/2 bpf: force checkpoint when jmp history is too long
A specifically crafted program might trick verifier into growing very long jump history within a single bpf_verifier_state instance. Very long jump history makes mark_chain_precision() unreasonably slow, especially in case if verifier processes a loop.
Mitigate this by forcing new state in is_state_visited() in case if current state's jump history is too long.
Use same constant as in skip_inf_loop_check, but multiply it by arbitrarily chosen value 2 to account for jump history containing not only information about jumps, but also information about stack access.
For an example of problematic program consider the code below, w/o this patch the example is processed by verifier for ~15 minutes, before failing to allocate big-enough chunk for jmp_history.
0: r7 = *(u16 *)(r1 +0);"
1: r7 += 0x1ab064b9;"
2: if r7 & 0x702000 goto 1b;
3: r7 &= 0x1ee60e;"
4: r7 += r1;"
5: if r7 s> 0x37d2 goto +0;"
6: r0 = 0;"
7: exit;"Perf profiling shows that most of the time is spent in mark_chain_precision() ~95%.
The easiest way to explain why this program causes problems is to apply the following patch:
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 0c216e71cec7..4b4823961abe 100644
\--- a/include/linux/bpf.h
\+++ b/include/linux/bpf.h
\@@ -1926,7 +1926,7 @@ struct bpf_array {
};
};
-#define BPF_COMPLEXITY_LIMIT_INSNS 1000000 /* yes. 1M insns */
+#define BPF_COMPLEXITY_LIMIT_INSNS 256 /* yes. 1M insns */
#define MAX_TAIL_CALL_CNT 33
/* Maximum number of loops for bpf_loop and bpf_iter_num.
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index f514247ba8ba..75e88be3bb3e 100644
\--- a/kernel/bpf/verifier.c
\+++ b/kernel/bpf/verifier.c
\@@ -18024,8 +18024,13 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx)
skip_inf_loop_check:
if (!force_new_state &&
env->jmps_processed - env->prev_jmps_processed < 20 &&
- env->insn_processed - env->prev_insn_processed < 100)
+ env->insn_processed - env->prev_insn_processed < 100) {
+ verbose(env, "is_state_visited: suppressing checkpoint at %d, %d jmps processed, cur->jmp_history_cnt is %d\n",
+ env->insn_idx,
+ env->jmps_processed - env->prev_jmps_processed,
+ cur->jmp_history_cnt);
add_new_state = false;
+ }
goto miss;
}
/* If sl->state is a part of a loop and this loop's entry is a part of
\@@ -18142,6 +18147,9 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx)
if (!add_new_state)
return 0;
+ verbose(env, "is_state_visited: new checkpoint at %d, resetting env->jmps_processed\n",
+ env->insn_idx);
+
/* There were no equivalent states, remember the current one.
* Technically the current state is not proven to be safe yet,
* but it will either reach outer most bpf_exit (which means it's safe)And observe verification log:
...
is_state_visited: new checkpoint at 5, resetting env->jmps_processed
5: R1=ctx() R7=ctx(...)
5: (65) if r7 s> 0x37d2 goto pc+0 ; R7=ctx(...)
6: (b7) r0 = 0 ; R0_w=0
7: (95) exit
from 5 to 6: R1=ctx() R7=ctx(...) R10=fp0
6: R1=ctx() R7=ctx(...) R10=fp0
6: (b7) r0 = 0 ; R0_w=0
7: (95) exit
is_state_visited: suppressing checkpoint at 1, 3 jmps processed, cur->jmp_history_cnt is 74
from 2 to 1: R1=ctx() R7_w=scalar(...) R10=fp0
1: R1=ctx() R7_w=scalar(...) R10=fp0
1: (07) r7 += 447767737
is_state_visited: suppressing checkpoint at 2, 3 jmps processed, cur->jmp_history_cnt is 75
2: R7_w=scalar(...)
2: (45) if r7 & 0x702000 goto pc-2
... mark_precise 152 steps for r7 ...
2: R7_w=scalar(...)
is_state_visited: suppressing checkpoint at 1, 4 jmps processed, cur->jmp_history_cnt is 75
1: (07) r7 += 447767737
is_state_visited: suppressing checkpoint at 2, 4 jmps processed, cur->jmp_history_cnt is 76
2: R7_w=scalar(...)
2: (45) if r7 & 0x702000 goto pc-2
...
BPF program is too large. Processed 257 insnThe log output shows that checkpoint at label (1) is never created, because it is suppressed by skip_inf_loop_check logic:
a. When 'if' at (2) is processed it pushes a state with insn_idx (1)
onto stack and proceeds to (3);
b. At (5) checkpoint is created, and this resets
env->{jmps,insns}_processed.
c. Verification proceeds and reaches exit;
d. State saved at step (a) is popped from stack and is_state_visited()
considers if checkpoint needs to be added, but because env->{jmps,insns}_processed had been just reset at step (b) the skip_inf_loop_check logic forces add_new_state to false.
e. Verifier proceeds with current state, which slowly accumulates
more and more entries in the jump history.
The accumulation of entries in the jump history is a problem because of two factors:
- it eventually exhausts memory available for kmalloc() allocation;
- mark_chain_precision() traverses the jump history of a state, meaning that if r7 is marked precise, verifier would iterate ever growing jump history until parent state boundary is reached.
(note: the log also shows a REG INVARIANTS VIOLATION warning
upon jset processing, but that's another bug to fix).
With this patch applied, the example above is rejected by verifier under 1s of time, reaching 1M instructions limit.
The program is a simplified reproducer from syzbot report. Previous discussion could be found at [1].
The patch does not cause any changes in verification performance, when tested on selftests from veristat.cfg and cilium programs taken from [2].
[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://github.com/anakryiko/cilium
Changelog:
- v1 -> v2:
- moved patch to bpf tree;
- moved force_new_state variable initialization after declaration and shortened the comment.
v1: https://lore.kernel.org/bpf/[email protected]/
--- kernel/bpf/verifier.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +7 -2
@@ -17886,10 +17886,14 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx)struct bpf_verifier_state_list *sl, **pprev;struct bpf_verifier_state *cur = env->cur_state, *new, *loop_entry;int i, j, n, err, states_cnt =0 ; -bool force_new_state = env->test_state_freq ||is_force_checkpoint (env, insn_idx); -bool add_new_state = force_new_state; +bool force_new_state; +bool add_new_state;bool force_exact; + force_new_state = env->test_state_freq ||is_force_checkpoint (env, insn_idx) || +/* Avoid accumulating infinitely long jmp history */ + cur->jmp_history_cnt >40 ; +/* bpf progs typically have pruning point every 4 instructions * http://vger.kernel.org/bpfconf2019.html#session-1 * Do not add new state for future pruning if the verifier hasn't seen
@@ -17898,6 +17902,7 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx)* In tests that amounts to up to 50% reduction into total verifier * memory consumption and 20% verifier time speedup. */ + add_new_state = force_new_state;if (env->jmps_processed - env->prev_jmps_processed >=2 && env->insn_processed - env->prev_insn_processed >=8 ) add_new_state = true;
Signature · 1 line
2.47.0
Eduard Zingerman
maintainerPATCH v2 2/2 selftests/bpf: test with a very short loop
The test added is a simplified reproducer from syzbot report [1]. If verifier does not insert checkpoint somewhere inside the loop, verification of the program would take a very long time.
This would happen because mark_chain_precision() for register r7 would constantly trace jump history of the loop back, processing many iterations for each mark_chain_precision() call.
[1] https://lore.kernel.org/bpf/[email protected]/
--- .../bpf/progs/verifier_search_pruning.c | 23 +++++++++++++++++++ tools/testing/selftests/bpf/veristat.cfg | 1 + 2 files changed, 24 insertions(+)
tools/testing/selftests/bpf/progs/verifier_search_pruning.c +23 -0
@@ -2,6 +2,7 @@/* Converted from tools/testing/selftests/bpf/verifier/search_pruning.c */ #include <linux/bpf.h> +#include <../../../include/linux/filter.h> #include <bpf/bpf_helpers.h> #include "bpf_misc.h"
@@ -336,4 +337,26 @@ l0_%=: r1 = 42; \ : __clobber_all); } +/* Without checkpoint forcibly inserted at the back-edge a loop this +* test would take a very long time to verify. +*/ +SEC("kprobe") +__failure __log_level(4) +__msg("BPF program is too large.") +__naked void short_loop1 (void ) +{ + asmvolatile ( +" r7 = *(u16 *)(r1 +0);" +"1: r7 += 0x1ab064b9;" +" .8byte %[jset];" /* same as 'if r7 & 0x702000 goto 1b;' */ +" r7 &= 0x1ee60e;" +" r7 += r1;" +" if r7 s> 0x37d2 goto +0;" +" r0 = 0;" +" exit;" + : + : __imm_insn(jset, BPF_JMP_IMM(BPF_JSET, BPF_REG_7, 0x702000, -2)) + : __clobber_all); +} + char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/veristat.cfg +1 -0
@@ -15,3 +15,4 @@ test_usdt* test_verif_scale* test_xdp_noinline* xdp_synproxy* +verifier_search_pruning*
Signature · 1 line
2.47.0
This series was applied to bpf/bpf.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This series was applied to bpf/bpf.git (master)
by Andrii Nakryiko <[email protected]>:
Quoted 9 lines · On Tue, 29 Oct 2024 10:26:40 -0700 you wrote:
A specifically crafted program might trick verifier into growing very long jump history within a single
bpf_verifier_stateinstance. Very long jump history makesmark_chain_precision()unreasonably slow, especially in case if verifier processes a loop.Mitigate this by forcing new state in
is_state_visited()in case if current state's jump history is too long.[...]
Here is the summary with links:
- [bpf,v2,1/2] bpf: force checkpoint when jmp history is too long
https://git.kernel.org/bpf/bpf/c/aa30eb3260b2 - [bpf,v2,2/2] selftests/bpf: test with a very short loop https://git.kernel.org/bpf/bpf/c/1fb315892d83
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 163 lines · Eduard Zingerman
A specifically crafted program might trick verifier into growing very long jump history within a single
bpf_verifier_stateinstance. Very long jump history makesmark_chain_precision()unreasonably slow, especially in case if verifier processes a loop.Mitigate this by forcing new state in
is_state_visited()in case if current state's jump history is too long.Use same constant as in
skip_inf_loop_check, but multiply it by arbitrarily chosen value 2 to account for jump history containing not only information about jumps, but also information about stack access.For an example of problematic program consider the code below, w/o this patch the example is processed by verifier for ~15 minutes, before failing to allocate big-enough chunk for
jmp_history.0: r7 = *(u16 *)(r1 +0);" 1: r7 += 0x1ab064b9;" 2: if r7 & 0x702000 goto 1b; 3: r7 &= 0x1ee60e;" 4: r7 += r1;" 5: if r7 s> 0x37d2 goto +0;" 6: r0 = 0;" 7: exit;"Perf profiling shows that most of the time is spent in
mark_chain_precision()~95%.The easiest way to explain why this program causes problems is to apply the following patch:
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 0c216e71cec7..4b4823961abe 100644 \--- a/include/linux/bpf.h \+++ b/include/linux/bpf.h \@@ -1926,7 +1926,7 @@ struct bpf_array { }; }; -#define BPF_COMPLEXITY_LIMIT_INSNS 1000000 /* yes. 1M insns */ +#define BPF_COMPLEXITY_LIMIT_INSNS 256 /* yes. 1M insns */ #define MAX_TAIL_CALL_CNT 33 /* Maximum number of loops for bpf_loop and bpf_iter_num. diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index f514247ba8ba..75e88be3bb3e 100644 \--- a/kernel/bpf/verifier.c \+++ b/kernel/bpf/verifier.c \@@ -18024,8 +18024,13 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx) skip_inf_loop_check: if (!force_new_state && env->jmps_processed - env->prev_jmps_processed < 20 && - env->insn_processed - env->prev_insn_processed < 100) + env->insn_processed - env->prev_insn_processed < 100) { + verbose(env, "is_state_visited: suppressing checkpoint at %d, %d jmps processed, cur->jmp_history_cnt is %d\n", + env->insn_idx, + env->jmps_processed - env->prev_jmps_processed, + cur->jmp_history_cnt); add_new_state = false; + } goto miss; } /* If sl->state is a part of a loop and this loop's entry is a part of \@@ -18142,6 +18147,9 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx) if (!add_new_state) return 0; + verbose(env, "is_state_visited: new checkpoint at %d, resetting env->jmps_processed\n", + env->insn_idx); + /* There were no equivalent states, remember the current one. * Technically the current state is not proven to be safe yet, * but it will either reach outer most bpf_exit (which means it's safe)And observe verification log:
... is_state_visited: new checkpoint at 5, resetting env->jmps_processed 5: R1=ctx() R7=ctx(...) 5: (65) if r7 s> 0x37d2 goto pc+0 ; R7=ctx(...) 6: (b7) r0 = 0 ; R0_w=0 7: (95) exit from 5 to 6: R1=ctx() R7=ctx(...) R10=fp0 6: R1=ctx() R7=ctx(...) R10=fp0 6: (b7) r0 = 0 ; R0_w=0 7: (95) exit is_state_visited: suppressing checkpoint at 1, 3 jmps processed, cur->jmp_history_cnt is 74 from 2 to 1: R1=ctx() R7_w=scalar(...) R10=fp0 1: R1=ctx() R7_w=scalar(...) R10=fp0 1: (07) r7 += 447767737 is_state_visited: suppressing checkpoint at 2, 3 jmps processed, cur->jmp_history_cnt is 75 2: R7_w=scalar(...) 2: (45) if r7 & 0x702000 goto pc-2 ... mark_precise 152 steps for r7 ... 2: R7_w=scalar(...) is_state_visited: suppressing checkpoint at 1, 4 jmps processed, cur->jmp_history_cnt is 75 1: (07) r7 += 447767737 is_state_visited: suppressing checkpoint at 2, 4 jmps processed, cur->jmp_history_cnt is 76 2: R7_w=scalar(...) 2: (45) if r7 & 0x702000 goto pc-2 ... BPF program is too large. Processed 257 insnThe log output shows that checkpoint at label (1) is never created, because it is suppressed by
skip_inf_loop_checklogic:
a. When 'if' at (2) is processed it pushes a state withinsn_idx(1)
onto stack and proceeds to (3);
b. At (5) checkpoint is created, and this resets
env->{jmps,insns}_processed.
c. Verification proceeds and reachesexit;
d. State saved at step (a) is popped from stack andis_state_visited()
considers if checkpoint needs to be added, but because env->{jmps,insns}_processed had been just reset at step (b) theskip_inf_loop_checklogic forcesadd_new_stateto false.
e. Verifier proceeds with current state, which slowly accumulates
more and more entries in the jump history.The accumulation of entries in the jump history is a problem because of two factors:
- it eventually exhausts memory available forkmalloc()allocation;
-mark_chain_precision()traverses the jump history of a state, meaning that ifr7is marked precise, verifier would iterate ever growing jump history until parent state boundary is reached.(note: the log also shows a REG INVARIANTS VIOLATION warning
upon jset processing, but that's another bug to fix).With this patch applied, the example above is rejected by verifier under 1s of time, reaching 1M instructions limit.
The program is a simplified reproducer from syzbot report. Previous discussion could be found at [1].
The patch does not cause any changes in verification performance, when tested on selftests from veristat.cfg and cilium programs taken from [2].[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://github.com/anakryiko/ciliumChangelog:
- v1 -> v2:
- moved patch to bpf tree;
- movedforce_new_statevariable initialization after declaration and shortened the comment.
v1: https://lore.kernel.org/bpf/[email protected]/Reported-by [email protected]Fixes 2589726d12a1 ("bpf: introduce bounded loops")Acked-by Daniel Borkmann <[email protected]>Signed-off-by Eduard Zingerman <[email protected]>--- kernel/bpf/verifier.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)kernel/bpf/verifier.c +0
-0
kernel/bpf/verifier.c static int is_state_visited(struct bpf_verifier_env *env, int insn_idx) · line 17891
Quoted 8 lines
kernel/bpf/verifier.c +2
-2@@ -17886,10 +17886,14 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx)struct bpf_verifier_state_list *sl, **pprev;struct bpf_verifier_state *cur = env->cur_state, *new, *loop_entry;int i, j, n, err, states_cnt =0 ; -bool force_new_state = env->test_state_freq ||is_force_checkpoint (env, insn_idx); -bool add_new_state = force_new_state; +bool force_new_state; +bool add_new_state;bool force_exact;
I've combined three bools into a single line.
Quoted 19 lines
kernel/bpf/verifier.c +5
-1+ force_new_state = env->test_state_freq ||is_force_checkpoint (env, insn_idx) || +/* Avoid accumulating infinitely long jmp history */ + cur->jmp_history_cnt >40 ; +/* bpf progs typically have pruning point every 4 instructions * http://vger.kernel.org/bpfconf2019.html#session-1 * Do not add new state for future pruning if the verifier hasn't seen @@ -17898,6 +17902,7 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx)* In tests that amounts to up to 50% reduction into total verifier * memory consumption and 20% verifier time speedup. */ + add_new_state = force_new_state;if (env->jmps_processed - env->prev_jmps_processed >=2 && env->insn_processed - env->prev_insn_processed >=8 ) add_new_state = true; --2.47.0
Quoted 188 lines · Eduard Zingerman
A specifically crafted program might trick verifier into growing very long jump history within a single
bpf_verifier_stateinstance. Very long jump history makesmark_chain_precision()unreasonably slow, especially in case if verifier processes a loop.Mitigate this by forcing new state in
is_state_visited()in case if current state's jump history is too long.Use same constant as in
skip_inf_loop_check, but multiply it by arbitrarily chosen value 2 to account for jump history containing not only information about jumps, but also information about stack access.For an example of problematic program consider the code below, w/o this patch the example is processed by verifier for ~15 minutes, before failing to allocate big-enough chunk for
jmp_history.0: r7 = *(u16 *)(r1 +0);" 1: r7 += 0x1ab064b9;" 2: if r7 & 0x702000 goto 1b; 3: r7 &= 0x1ee60e;" 4: r7 += r1;" 5: if r7 s> 0x37d2 goto +0;" 6: r0 = 0;" 7: exit;"Perf profiling shows that most of the time is spent in
mark_chain_precision()~95%.The easiest way to explain why this program causes problems is to apply the following patch:
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 0c216e71cec7..4b4823961abe 100644 \--- a/include/linux/bpf.h \+++ b/include/linux/bpf.h \@@ -1926,7 +1926,7 @@ struct bpf_array { }; }; -#define BPF_COMPLEXITY_LIMIT_INSNS 1000000 /* yes. 1M insns */ +#define BPF_COMPLEXITY_LIMIT_INSNS 256 /* yes. 1M insns */ #define MAX_TAIL_CALL_CNT 33 /* Maximum number of loops for bpf_loop and bpf_iter_num. diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index f514247ba8ba..75e88be3bb3e 100644 \--- a/kernel/bpf/verifier.c \+++ b/kernel/bpf/verifier.c \@@ -18024,8 +18024,13 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx) skip_inf_loop_check: if (!force_new_state && env->jmps_processed - env->prev_jmps_processed < 20 && - env->insn_processed - env->prev_insn_processed < 100) + env->insn_processed - env->prev_insn_processed < 100) { + verbose(env, "is_state_visited: suppressing checkpoint at %d, %d jmps processed, cur->jmp_history_cnt is %d\n", + env->insn_idx, + env->jmps_processed - env->prev_jmps_processed, + cur->jmp_history_cnt); add_new_state = false; + } goto miss; } /* If sl->state is a part of a loop and this loop's entry is a part of \@@ -18142,6 +18147,9 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx) if (!add_new_state) return 0; + verbose(env, "is_state_visited: new checkpoint at %d, resetting env->jmps_processed\n", + env->insn_idx); + /* There were no equivalent states, remember the current one. * Technically the current state is not proven to be safe yet, * but it will either reach outer most bpf_exit (which means it's safe)And observe verification log:
... is_state_visited: new checkpoint at 5, resetting env->jmps_processed 5: R1=ctx() R7=ctx(...) 5: (65) if r7 s> 0x37d2 goto pc+0 ; R7=ctx(...) 6: (b7) r0 = 0 ; R0_w=0 7: (95) exit from 5 to 6: R1=ctx() R7=ctx(...) R10=fp0 6: R1=ctx() R7=ctx(...) R10=fp0 6: (b7) r0 = 0 ; R0_w=0 7: (95) exit is_state_visited: suppressing checkpoint at 1, 3 jmps processed, cur->jmp_history_cnt is 74 from 2 to 1: R1=ctx() R7_w=scalar(...) R10=fp0 1: R1=ctx() R7_w=scalar(...) R10=fp0 1: (07) r7 += 447767737 is_state_visited: suppressing checkpoint at 2, 3 jmps processed, cur->jmp_history_cnt is 75 2: R7_w=scalar(...) 2: (45) if r7 & 0x702000 goto pc-2 ... mark_precise 152 steps for r7 ... 2: R7_w=scalar(...) is_state_visited: suppressing checkpoint at 1, 4 jmps processed, cur->jmp_history_cnt is 75 1: (07) r7 += 447767737 is_state_visited: suppressing checkpoint at 2, 4 jmps processed, cur->jmp_history_cnt is 76 2: R7_w=scalar(...) 2: (45) if r7 & 0x702000 goto pc-2 ... BPF program is too large. Processed 257 insnThe log output shows that checkpoint at label (1) is never created, because it is suppressed by
skip_inf_loop_checklogic:
a. When 'if' at (2) is processed it pushes a state withinsn_idx(1)
onto stack and proceeds to (3);
b. At (5) checkpoint is created, and this resets
env->{jmps,insns}_processed.
c. Verification proceeds and reachesexit;
d. State saved at step (a) is popped from stack andis_state_visited()
considers if checkpoint needs to be added, but because env->{jmps,insns}_processed had been just reset at step (b) theskip_inf_loop_checklogic forcesadd_new_stateto false.
e. Verifier proceeds with current state, which slowly accumulates
more and more entries in the jump history.The accumulation of entries in the jump history is a problem because of two factors:
- it eventually exhausts memory available forkmalloc()allocation;
-mark_chain_precision()traverses the jump history of a state, meaning that ifr7is marked precise, verifier would iterate ever growing jump history until parent state boundary is reached.(note: the log also shows a REG INVARIANTS VIOLATION warning
upon jset processing, but that's another bug to fix).With this patch applied, the example above is rejected by verifier under 1s of time, reaching 1M instructions limit.
The program is a simplified reproducer from syzbot report. Previous discussion could be found at [1].
The patch does not cause any changes in verification performance, when tested on selftests from veristat.cfg and cilium programs taken from [2].[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://github.com/anakryiko/ciliumChangelog:
- v1 -> v2:
- moved patch to bpf tree;
- movedforce_new_statevariable initialization after declaration and shortened the comment.
v1: https://lore.kernel.org/bpf/[email protected]/Reported-by [email protected]Fixes 2589726d12a1 ("bpf: introduce bounded loops")Acked-by Daniel Borkmann <[email protected]>Signed-off-by Eduard Zingerman <[email protected]>--- kernel/bpf/verifier.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)kernel/bpf/verifier.c +7
-3@@ -17886,10 +17886,14 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx)struct bpf_verifier_state_list *sl, **pprev;struct bpf_verifier_state *cur = env->cur_state, *new, *loop_entry;int i, j, n, err, states_cnt =0 ; -bool force_new_state = env->test_state_freq ||is_force_checkpoint (env, insn_idx); -bool add_new_state = force_new_state; +bool force_new_state; +bool add_new_state;bool force_exact; + force_new_state = env->test_state_freq ||is_force_checkpoint (env, insn_idx) || +/* Avoid accumulating infinitely long jmp history */ + cur->jmp_history_cnt >40 ; +/* bpf progs typically have pruning point every 4 instructions * http://vger.kernel.org/bpfconf2019.html#session-1 * Do not add new state for future pruning if the verifier hasn't seen @@ -17898,6 +17902,7 @@ static int is_state_visited(struct bpf_verifier_env *env, int insn_idx)* In tests that amounts to up to 50% reduction into total verifier * memory consumption and 20% verifier time speedup. */ + add_new_state = force_new_state;if (env->jmps_processed - env->prev_jmps_processed >=2 && env->insn_processed - env->prev_insn_processed >=8 ) add_new_state = true; --
Quoted 3 lines
2.47.0
Sorry to reply to an old thread, but just in case archeology will be useful for
backports: I ran into the bug/pathology fixed here (on kernels before the fix -- thanks for fixing!).
I believe the bug had been exposed by a prior commit, in v6.6 ([1]). I think that commit has since been backported further back.
[1] https://github.com/torvalds/linux/commit/4bb7ea946a370707315ab774432963ce47291946
FWIW, I wouldn't call the programs running into this pathology "specifically crafted". Triggering the issue is as simple as the following loop:
__attribute__((noinline))
bool helper() {
return bpf_get_prandom_u32() == 0;
}bool loop(struct pt_regs* ctx) {
for (int i = 0; i < 1000; i++) {
if (!helper()) {
return false;
}
}
return true;
}