bpf: take into account liveness when propagating precision
Andrii Nakryiko
maintainerPATCH 1/1 bpf: take into account liveness when propagating precision
When doing state comparison, if old state has register that is not marked as REG_LIVE_READ, then we just skip comparison, regardless what's the state of corresponing register in current state. This is because not REG_LIVE_READ register is irrelevant for further program execution and correctness. All good here.
But when we get to precision propagation, after two states were declared equivalent, we don't take into account old register's liveness, and thus attempt to propagate precision for register in current state even if that register in old state was not REG_LIVE_READ anymore. This is bad, because register in current state could be anything at all and this could cause -EFAULT due to internal logic bugs.
Fix by taking into account REG_LIVE_READ liveness mark to keep the logic in state comparison in sync with precision propagation.
--- kernel/bpf/verifier.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +4 -2
@@ -14201,7 +14201,8 @@ static int propagate_precision(struct bpf_verifier_env *env, state_reg = state->regs;for (i =0 ; i <BPF_REG_FP ; i++, state_reg++) {if (state_reg->type !=SCALAR_VALUE || - !state_reg->precise) + !state_reg->precise || + !(state_reg->live ®_LIVE_READ ))continue ;if (env->log.level &BPF_LOG_LEVEL2 )verbose (env,"frame %d: propagating r%d\n" , i, fr);
@@ -14215,7 +14216,8 @@ static int propagate_precision(struct bpf_verifier_env *env,continue ; state_reg = &state->stack[i].spilled_ptr;if (state_reg->type !=SCALAR_VALUE || - !state_reg->precise) + !state_reg->precise || + !(state_reg->live ®_LIVE_READ ))continue ;if (env->log.level &BPF_LOG_LEVEL2 ) verbose(env, "frame %d: propagating fp%d\n",
Signature · 1 line
2.34.1
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 6 lines · On Thu, 9 Mar 2023 14:41:31 -0800 you wrote:
When doing state comparison, if old state has register that is not marked as
REG_LIVE_READ, then we just skip comparison, regardless what's the state of corresponing register in current state. This is because notREG_LIVE_READregister is irrelevant for further program execution and correctness. All good here.
Quoted 8 lines
But when we get to precision propagation, after two states were declared equivalent, we don't take into account old register's liveness, and thus attempt to propagate precision for register in current state even if that register in old state was not
REG_LIVE_READanymore. This is bad, because register in current state could be anything at all and this could cause-EFAULTdue to internal logic bugs.[...]
Here is the summary with links:
- [bpf] bpf: take into account liveness when propagating precision
https://git.kernel.org/bpf/bpf-next/c/52c2b005a3c1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html